aboutsummaryrefslogtreecommitdiff
path: root/docker/fedora-rdo-base
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-02-06 19:09:04 +0000
committerGerrit Code Review <review@openstack.org>2015-02-06 19:09:04 +0000
commit4855d96c32086dff7fc3b0d249ea406f2f13f02a (patch)
treed6e3ed24be9194405998fb07ee6cf01be92ce5c4 /docker/fedora-rdo-base
parent26b564dd06890862e268ea72b987bcb5ebf4bdb2 (diff)
parentf4b7ae95ac24f395e8d7ddd36cba362659fd29b4 (diff)
downloadkolla-4855d96c32086dff7fc3b0d249ea406f2f13f02a.tar.gz
kolla-4855d96c32086dff7fc3b0d249ea406f2f13f02a.zip
Merge "Check for nova DB availability in dependent containers"
Diffstat (limited to 'docker/fedora-rdo-base')
-rw-r--r--docker/fedora-rdo-base/kolla-common.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/fedora-rdo-base/kolla-common.sh b/docker/fedora-rdo-base/kolla-common.sh
index c9ba03be5..56c658c43 100644
--- a/docker/fedora-rdo-base/kolla-common.sh
+++ b/docker/fedora-rdo-base/kolla-common.sh
@@ -56,12 +56,14 @@ check_for_neutron() {
}
# Exit unless we receive a successful response from the database server.
+# Optionally takes a database name to check for. Defaults to 'mysql'.
check_for_db() {
+ local database=${1:-mysql}
check_required_vars MARIADB_SERVICE_HOST DB_ROOT_PASSWORD
mysql -h ${MARIADB_SERVICE_HOST} -u root -p"${DB_ROOT_PASSWORD}" \
- -e "select 1" mysql > /dev/null 2>&1 || {
- echo "ERROR: database is not available @ $MARIADB_SERVICE_HOST" >&2
+ -e "select 1" $database > /dev/null 2>&1 || {
+ echo "ERROR: database $database is not available @ $MARIADB_SERVICE_HOST" >&2
exit 1
}