1. devstack
  2. Commit 6d4a9a87b7aebca2de7bfe034dff630d49f52883
Browse code

Don't kill ceilometer prematurally in devstackgate

This change ensure that 'ceilometer' processes are not killed
by stack.sh when USE_SCREEN=False

Fixes bug #1234254

Change-Id: I48dbf18ea0b169cdb5295a709d82c025f6fb8930

Mehdi Abaakouk authored on 2013/10/14 23:20:32
Showing 1 changed files
lib/ceilometer
History View file @ 6d4a9a8
... ... 
@@ -134,12 +134,12 @@ function install_ceilometerclient() {
134 134
135 135 
 # start_ceilometer() - Start running processes, including screen
136 136 
 function start_ceilometer() {
137 
-    screen_it ceilometer-acompute "sg $LIBVIRT_GROUP \"ceilometer-agent-compute --config-file $CEILOMETER_CONF\""
138 
-    screen_it ceilometer-acentral "ceilometer-agent-central --config-file $CEILOMETER_CONF"
139 
-    screen_it ceilometer-collector "ceilometer-collector --config-file $CEILOMETER_CONF"
140 
-    screen_it ceilometer-api "ceilometer-api -d -v --log-dir=$CEILOMETER_API_LOG_DIR --config-file $CEILOMETER_CONF"
141 
-    screen_it ceilometer-alarm-notifier "ceilometer-alarm-notifier --config-file $CEILOMETER_CONF"
142 
-    screen_it ceilometer-alarm-evaluator "ceilometer-alarm-evaluator --config-file $CEILOMETER_CONF"
137 
+    screen_it ceilometer-acompute "cd ; sg $LIBVIRT_GROUP \"ceilometer-agent-compute --config-file $CEILOMETER_CONF\""
138 
+    screen_it ceilometer-acentral "cd ; ceilometer-agent-central --config-file $CEILOMETER_CONF"
139 
+    screen_it ceilometer-collector "cd ; ceilometer-collector --config-file $CEILOMETER_CONF"
140 
+    screen_it ceilometer-api "cd ; ceilometer-api -d -v --log-dir=$CEILOMETER_API_LOG_DIR --config-file $CEILOMETER_CONF"
141 
+    screen_it ceilometer-alarm-notifier "cd ; ceilometer-alarm-notifier --config-file $CEILOMETER_CONF"
142 
+    screen_it ceilometer-alarm-evaluator "cd ; ceilometer-alarm-evaluator --config-file $CEILOMETER_CONF"
143 143 
 }
144 144
145 145 
 # stop_ceilometer() - Stop running processes