Merge "Cleanup code of DevStack plugin"

devstack/lib/osprofiler

@@ -1,5 +1,5 @@
-# lib/rally
-# Functions to control the configuration and operation of the **Rally**
+# lib/osprofiler
+# Functions to control the configuration and operation of the **osprofiler**
 
 # Dependencies:
 #
@@ -62,12 +62,6 @@ function configure_osprofiler() {
 }
 
 
-# init_rally() - Initialize databases, etc.
-function init_osprofiler() {
-
-    echo "Do nothing here for now"
-}
-
 # Restore xtrace
 $XTRACE
 

devstack/plugin.sh

@@ -1,4 +1,4 @@
-# DevStack extras script to install Rally
+# DevStack extras script to install osprofiler
 
 # Save trace setting
 XTRACE=$(set +o | grep xtrace)
@@ -6,18 +6,9 @@ set -o xtrace
 
 source $DEST/osprofiler/devstack/lib/osprofiler
 
-if [[ "$1" == "source" ]]; then
-    # Initial source
-    source $TOP_DIR/lib/rally
-# elif [[ "$1" == "stack" && "$2" == "install" ]]; then
-#    echo_summary "Installing OSprofiler"
-#    install_rally
-elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
+if [[ "$1" == "stack" && "$2" == "post-config" ]]; then
     echo_summary "Configuring OSprofiler"
     configure_osprofiler
-elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
-    echo_summary "Initializing OSprofiler"
-    init_osprofiler
 fi
 
 # Restore xtrace