Only call save_mysql_dbs if using mysql
This adds some conditional logic around when mysql is used based on the configured database type in the devstack rc file. TODOs are left in place for supporting postgresql which can be fleshed out when we have a grenade-postgresql CI job to verify the changes. Change-Id: I30e7ee0c8de1add3c51824e30ca7ad103bb4a876
This commit is contained in:
parent
f695fa32e0
commit
682a8736a3
12
clean.sh
12
clean.sh
@ -72,10 +72,14 @@ ps auxw | grep ^rabbitmq | awk '{print $2}' | sudo xargs kill
|
||||
sudo service rabbitmq-server stop
|
||||
sudo apt-get purge -y rabbitmq-server .*erlang
|
||||
|
||||
# Get ruthless with mysql
|
||||
service mysqld stop
|
||||
sudo apt-get purge -y .*mysql-server
|
||||
sudo rm -rf /var/lib/mysql
|
||||
if [[ "${DATABASE_TYPE}" == "mysql" ]]; then
|
||||
# Get ruthless with mysql
|
||||
service mysqld stop
|
||||
sudo apt-get purge -y .*mysql-server
|
||||
sudo rm -rf /var/lib/mysql
|
||||
else
|
||||
echo "TODO: cleanup ${DATABASE_TYPE}"
|
||||
fi
|
||||
|
||||
# kill off swift, which doesn't live in screen, so doesn't die in screen
|
||||
ps auxw | grep swift | awk '{print $2}' | xargs kill
|
||||
|
10
functions
10
functions
@ -78,7 +78,15 @@ function save_data {
|
||||
local dir=$2
|
||||
echo_summary "Dumping $release databases"
|
||||
mkdir -p $SAVE_DIR
|
||||
save_mysql_dbs $release $dir
|
||||
local db_type=$(
|
||||
set +o xtrace &&
|
||||
source $dir/stackrc &&
|
||||
echo $DATABASE_TYPE)
|
||||
if [[ "${db_type}" == "mysql" ]]; then
|
||||
save_mysql_dbs $release $dir
|
||||
else
|
||||
echo_summary "TODO: save state for $db_type databases"
|
||||
fi
|
||||
}
|
||||
|
||||
function worlddump {
|
||||
|
Loading…
x
Reference in New Issue
Block a user