Merge "Add a variable to control keystone token format"
diff --git a/lib/ceilometer b/lib/ceilometer
index 043f481..b0f0377 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -41,8 +41,7 @@
# cleanup_ceilometer() - Remove residual data files, anything left over from previous
# runs that a clean run would need to clean up
function cleanup_ceilometer() {
- # This function intentionally left blank
- :
+ mongo ceilometer --eval "db.dropDatabase();"
}
# configure_ceilometer() - Set config files, create data dirs, etc
@@ -63,6 +62,7 @@
iniset $CEILOMETER_CONF DEFAULT sql_connection $BASE_SQL_CONN/nova?charset=utf8
iniset $CEILOMETER_CONF keystone_authtoken auth_protocol http
+ cleanup_ceilometer
}
# install_ceilometer() - Collect source and prepare
diff --git a/stack.sh b/stack.sh
index 59b2167..d101798 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1039,6 +1039,11 @@
SCREEN_HARDSTATUS='%{= .} %-Lw%{= .}%> %n%f %t*%{= .}%+Lw%< %-=%{g}(%{d}%H/%l%{g})'
fi
+# Clear screen rc file
+SCREENRC=$TOP_DIR/$SCREEN_NAME-screenrc
+if [[ -e $SCREENRC ]]; then
+ echo -n > $SCREENRC
+fi
# Create a new named screen to run processes in
screen -d -m -S $SCREEN_NAME -t shell -s /bin/bash
sleep 1
@@ -1266,8 +1271,10 @@
Q_PLUGIN_CONF_FILENAME=ryu.ini
Q_DB_NAME="ovs_quantum"
Q_PLUGIN_CLASS="quantum.plugins.ryu.ryu_quantum_plugin.RyuQuantumPluginV2"
- else
- echo "Unknown Quantum plugin '$Q_PLUGIN'.. exiting"
+ fi
+
+ if [[ $Q_PLUGIN_CONF_PATH == '' || $Q_PLUGIN_CONF_FILENAME == '' || $Q_PLUGIN_CLASS == '' ]]; then
+ echo "Quantum plugin not set.. exiting"
exit 1
fi