Browse code

Merge "Add ceilometer to the sys.path before the nova starts"

Jenkins authored on 2013/07/27 03:48:28
Showing 1 changed files
... ...
@@ -736,6 +736,9 @@ fi
736 736
 if is_service_enabled ceilometer; then
737 737
     install_ceilometerclient
738 738
     install_ceilometer
739
+    echo_summary "Configuring Ceilometer"
740
+    configure_ceilometer
741
+    configure_ceilometerclient
739 742
 fi
740 743
 
741 744
 if is_service_enabled heat; then
... ...
@@ -1211,9 +1214,6 @@ if is_service_enabled cinder; then
1211 1211
     start_cinder
1212 1212
 fi
1213 1213
 if is_service_enabled ceilometer; then
1214
-    echo_summary "Configuring Ceilometer"
1215
-    configure_ceilometer
1216
-    configure_ceilometerclient
1217 1214
     echo_summary "Starting Ceilometer"
1218 1215
     init_ceilometer
1219 1216
     start_ceilometer