summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorjoehuang <joehuang@huawei.com>2016-09-20 05:20:31 -0400
committerjoehuang <joehuang@huawei.com>2016-09-20 05:27:44 -0400
commit3f7394289faa2945e8f36d008cfb7dacf06279d6 (patch)
treede4c58563b7db1ebb33122ae1b4367b640e801eb /tools
parentb50a7a8c4d2f4a1e63b7dce077f9d3f726661a15 (diff)
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 <joehuang@huawei.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/kingbird/install_kingbird.sh4
1 files changed, 4 insertions, 0 deletions
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/