Browse code

Merge "Allow use of ceilometer agent coordination"

Jenkins authored on 2014/10/21 08:19:34
Showing 1 changed files
... ...
@@ -155,6 +155,11 @@ function configure_ceilometer {
155 155
     iniset $CEILOMETER_CONF DEFAULT verbose True
156 156
     iniset $CEILOMETER_CONF DEFAULT debug "$ENABLE_DEBUG_LOG_LEVEL"
157 157
 
158
+    if [[ -n "$CEILOMETER_COORDINATION_URL" ]]; then
159
+        iniset $CEILOMETER_CONF coordination backend_url $CEILOMETER_COORDINATION_URL
160
+        iniset $CEILOMETER_CONF compute workload_partitioning True
161
+    fi
162
+
158 163
     # Install the policy file for the API server
159 164
     cp $CEILOMETER_DIR/etc/ceilometer/policy.json $CEILOMETER_CONF_DIR
160 165
     iniset $CEILOMETER_CONF DEFAULT policy_file $CEILOMETER_CONF_DIR/policy.json
... ...
@@ -242,6 +247,9 @@ function install_ceilometer {
242 242
     git_clone $CEILOMETER_REPO $CEILOMETER_DIR $CEILOMETER_BRANCH
243 243
     setup_develop $CEILOMETER_DIR
244 244
 
245
+    if echo $CEILOMETER_COORDINATION_URL | grep -q '^memcached:'; then
246
+        install_package memcached
247
+    fi
245 248
 }
246 249
 
247 250
 # install_ceilometerclient() - Collect source and prepare