diff options
| author |   Dimitri Mazmanov <dimitri.mazmanov@ericsson.com> | 2016-09-19 11:32:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-19 11:32:18 +0000 |
| commit | 4fff5bd725bb57ed8c212416931631384b95f5ec (patch) | |
| tree | de4c58563b7db1ebb33122ae1b4367b640e801eb | |
| parent | 480b8324f159acc3785c726067cf6aabcc055a23 (diff) | |
| parent | c9bc9966fc5405c250deec2da9a1646888c37149 (diff) | |
Merge "installation script quits when no kingbird user/service exists"
| -rw-r--r-- | tools/kingbird/install_kingbird.sh | 4 |
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/ |