Create and initialize the signing_dir for ceilometer keystone
authentication. This ensures the ceilometer to use its own PKI cache
directory for authentication and avoids the authentication error due to
the invalid cached certifications.
Change-Id: I6fbc364695ae9be800245d14fd8945d531679550
... | ... |
@@ -32,6 +32,7 @@ CEILOMETER_DIR=$DEST/ceilometer |
32 | 32 |
CEILOMETER_CONF_DIR=/etc/ceilometer |
33 | 33 |
CEILOMETER_CONF=$CEILOMETER_CONF_DIR/ceilometer.conf |
34 | 34 |
CEILOMETER_API_LOG_DIR=/var/log/ceilometer-api |
35 |
+CEILOMETER_AUTH_CACHE_DIR=${CEILOMETER_AUTH_CACHE_DIR:-/var/cache/ceilometer} |
|
35 | 36 |
|
36 | 37 |
# Support potential entry-points console scripts |
37 | 38 |
if [ -d $CEILOMETER_DIR/bin ] ; then |
... | ... |
@@ -78,10 +79,19 @@ function configure_ceilometer() { |
78 | 78 |
iniset $CEILOMETER_CONF keystone_authtoken admin_user ceilometer |
79 | 79 |
iniset $CEILOMETER_CONF keystone_authtoken admin_password $SERVICE_PASSWORD |
80 | 80 |
iniset $CEILOMETER_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME |
81 |
+ iniset $CEILOMETER_CONF keystone_authtoken signing_dir $CEILOMETER_AUTH_CACHE_DIR |
|
81 | 82 |
|
82 | 83 |
cleanup_ceilometer |
83 | 84 |
} |
84 | 85 |
|
86 |
+# init_ceilometer() - Initialize etc. |
|
87 |
+function init_ceilometer() { |
|
88 |
+ # Create cache dir |
|
89 |
+ sudo mkdir -p $CEILOMETER_AUTH_CACHE_DIR |
|
90 |
+ sudo chown `whoami` $CEILOMETER_AUTH_CACHE_DIR |
|
91 |
+ rm -f $CEILOMETER_AUTH_CACHE_DIR/* |
|
92 |
+} |
|
93 |
+ |
|
85 | 94 |
# install_ceilometer() - Collect source and prepare |
86 | 95 |
function install_ceilometer() { |
87 | 96 |
git_clone $CEILOMETER_REPO $CEILOMETER_DIR $CEILOMETER_BRANCH |