Browse code

Merge "Move ceilometermiddleware installation to lib/swift"

Jenkins authored on 2015/07/07 12:34:28
Showing 2 changed files
... ...
@@ -360,16 +360,6 @@ function install_ceilometerclient {
360 360
     fi
361 361
 }
362 362
 
363
-# install_ceilometermiddleware() - Collect source and prepare
364
-function install_ceilometermiddleware {
365
-    if use_library_from_git "ceilometermiddleware"; then
366
-        git_clone_by_name "ceilometermiddleware"
367
-        setup_dev_lib "ceilometermiddleware"
368
-    else
369
-        pip_install_gr ceilometermiddleware
370
-    fi
371
-}
372
-
373 363
 # start_ceilometer() - Start running processes, including screen
374 364
 function start_ceilometer {
375 365
     run_process ceilometer-acentral "$CEILOMETER_BIN_DIR/ceilometer-agent-central --config-file $CEILOMETER_CONF"
... ...
@@ -697,6 +697,21 @@ function install_swiftclient {
697 697
     fi
698 698
 }
699 699
 
700
+# install_ceilometermiddleware() - Collect source and prepare
701
+#   note that this doesn't really have anything to do with ceilometer;
702
+#   though ceilometermiddleware has ceilometer in its name as an
703
+#   artifact of history, it is not a ceilometer specific tool. It
704
+#   simply generates pycadf-based notifications about requests and
705
+#   responses on the swift proxy
706
+function install_ceilometermiddleware {
707
+    if use_library_from_git "ceilometermiddleware"; then
708
+        git_clone_by_name "ceilometermiddleware"
709
+        setup_dev_lib "ceilometermiddleware"
710
+    else
711
+        pip_install_gr ceilometermiddleware
712
+    fi
713
+}
714
+
700 715
 # start_swift() - Start running processes, including screen
701 716
 function start_swift {
702 717
     # (re)start memcached to make sure we have a clean memcache.