summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devstack/lib/osprofiler10
-rw-r--r--devstack/plugin.sh13
2 files changed, 4 insertions, 19 deletions
diff --git a/devstack/lib/osprofiler b/devstack/lib/osprofiler
index f965598..5a5e72f 100644
--- a/devstack/lib/osprofiler
+++ b/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
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 303b605..348da47 100644
--- a/devstack/plugin.sh
+++ b/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