From 3f7394289faa2945e8f36d008cfb7dacf06279d6 Mon Sep 17 00:00:00 2001 From: joehuang Date: Tue, 20 Sep 2016 05:20:31 -0400 Subject: Cherry Pick the update from the master branch to stable/colorado branch These patches should be cherry picked to colorado branch: https://gerrit.opnfv.org/gerrit/#/c/20077/ https://gerrit.opnfv.org/gerrit/#/c/20635/ https://gerrit.opnfv.org/gerrit/#/c/19833/ https://gerrit.opnfv.org/gerrit/#/c/19587/ But because the structure of the folder was changed in https://gerrit.opnfv.org/gerrit/#/c/19833/ cherry pick using gerrit will lead to merge conflict, has to update the colorado branch through this patch. Change-Id: I971eb28520b47b14de52a761269518b959c6921c Signed-off-by: joehuang --- tools/kingbird/install_kingbird.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tools/kingbird/install_kingbird.sh') diff --git a/tools/kingbird/install_kingbird.sh b/tools/kingbird/install_kingbird.sh index 96f13c3..8619ff3 100644 --- a/tools/kingbird/install_kingbird.sh +++ b/tools/kingbird/install_kingbird.sh @@ -89,6 +89,8 @@ mysql -uroot -e "DROP DATABASE IF EXISTS $mysql_db;" mysql -uroot -e "CREATE DATABASE $mysql_db CHARACTER SET utf8;" mysql -uroot -e "GRANT ALL PRIVILEGES ON $mysql_db.* TO '$mysql_user'@'$mysql_host' IDENTIFIED BY '$mysql_pass';" +set +e + #Configure kingbird user openstack user show kingbird 2>/dev/null if [ $? -eq 0 ]; then @@ -113,6 +115,8 @@ else --region ${OS_REGION_NAME} fi +set -e + # Cleanup the folder before making a fresh clone rm -rf kingbird/ -- cgit 1.2.3-korg