Browse code

Merge "Create signing_dir for ceilometer."

Jenkins authored on 2013/01/10 18:23:51
Showing 2 changed files
... ...
@@ -33,6 +33,7 @@ CEILOMETERCLIENT_DIR=$DEST/python-ceilometerclient
33 33
 CEILOMETER_CONF_DIR=/etc/ceilometer
34 34
 CEILOMETER_CONF=$CEILOMETER_CONF_DIR/ceilometer.conf
35 35
 CEILOMETER_API_LOG_DIR=/var/log/ceilometer-api
36
+CEILOMETER_AUTH_CACHE_DIR=${CEILOMETER_AUTH_CACHE_DIR:-/var/cache/ceilometer}
36 37
 
37 38
 # Support potential entry-points console scripts
38 39
 if [ -d $CEILOMETER_DIR/bin ] ; then
... ...
@@ -84,10 +85,19 @@ function configure_ceilometer() {
84 84
     iniset $CEILOMETER_CONF keystone_authtoken admin_user ceilometer
85 85
     iniset $CEILOMETER_CONF keystone_authtoken admin_password $SERVICE_PASSWORD
86 86
     iniset $CEILOMETER_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
87
+    iniset $CEILOMETER_CONF keystone_authtoken signing_dir $CEILOMETER_AUTH_CACHE_DIR
87 88
 
88 89
     cleanup_ceilometer
89 90
 }
90 91
 
92
+# init_ceilometer() - Initialize etc.
93
+function init_ceilometer() {
94
+    # Create cache dir
95
+    sudo mkdir -p $CEILOMETER_AUTH_CACHE_DIR
96
+    sudo chown `whoami` $CEILOMETER_AUTH_CACHE_DIR
97
+    rm -f $CEILOMETER_AUTH_CACHE_DIR/*
98
+}
99
+
91 100
 # install_ceilometer() - Collect source and prepare
92 101
 function install_ceilometer() {
93 102
     git_clone $CEILOMETER_REPO $CEILOMETER_DIR $CEILOMETER_BRANCH
... ...
@@ -1221,6 +1221,7 @@ if is_service_enabled ceilometer; then
1221 1221
     configure_ceilometer
1222 1222
     configure_ceilometerclient
1223 1223
     echo_summary "Starting Ceilometer"
1224
+    init_ceilometer
1224 1225
     start_ceilometer
1225 1226
 fi
1226 1227