aboutsummaryrefslogtreecommitdiff
path: root/docker/swift
diff options
context:
space:
mode:
authorMartin André <martin.andre@kvhasia.com>2015-03-30 10:14:03 +0900
committerMartin André <martin.andre@kvhasia.com>2015-04-01 16:39:44 +0900
commit34872c1c2f68f4a410c423ed8b615822a29ff94a (patch)
treed68f9b10e68580956a2a3d20f28d8923f255aa25 /docker/swift
parentcf3086ed3bca797ecc34e9c401951d1d64fe326a (diff)
downloadkolla-34872c1c2f68f4a410c423ed8b615822a29ff94a.tar.gz
kolla-34872c1c2f68f4a410c423ed8b615822a29ff94a.zip
Allow check_for_* functions to be consumed by wait_for
In order for the `check_for_*` functions to be consumed by `wait_for`, they should notify of their success but not exit. As a consequence, the previous behavior is restored by the fail_unless_* companion functions. With this change, it is now possible to do: wait_for 30 1 check_for_os_service_running keystone Change-Id: I16ddf8913027030c3ccb5487713d172904508fd6
Diffstat (limited to 'docker/swift')
-rw-r--r--docker/swift/swift-account/start.sh4
-rw-r--r--docker/swift/swift-container/start.sh4
-rw-r--r--docker/swift/swift-object/start.sh4
3 files changed, 6 insertions, 6 deletions
diff --git a/docker/swift/swift-account/start.sh b/docker/swift/swift-account/start.sh
index 2fe6f2469..884a24742 100644
--- a/docker/swift/swift-account/start.sh
+++ b/docker/swift/swift-account/start.sh
@@ -8,8 +8,8 @@
check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
SWIFT_ADMIN_PASSWORD
-check_for_db
-check_for_keystone
+fail_unless_db
+fail_unless_os_service_running keystone
if ! [ "$SWIFT_DB_PASSWORD" ]; then
SWIFT_DB_PASSWORD=$(openssl rand -hex 15)
diff --git a/docker/swift/swift-container/start.sh b/docker/swift/swift-container/start.sh
index 2a191e1d2..42b426c74 100644
--- a/docker/swift/swift-container/start.sh
+++ b/docker/swift/swift-container/start.sh
@@ -8,8 +8,8 @@
check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
SWIFT_ADMIN_PASSWORD
-check_for_db
-check_for_keystone
+fail_unless_db
+fail_unless_os_service_running keystone
if ! [ "$SWIFT_DB_PASSWORD" ]; then
SWIFT_DB_PASSWORD=$(openssl rand -hex 15)
diff --git a/docker/swift/swift-object/start.sh b/docker/swift/swift-object/start.sh
index c43efc5fb..430a87b69 100644
--- a/docker/swift/swift-object/start.sh
+++ b/docker/swift/swift-object/start.sh
@@ -8,8 +8,8 @@
check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
SWIFT_ADMIN_PASSWORD
-check_for_db
-check_for_keystone
+fail_unless_db
+fail_unless_os_service_running keystone
if ! [ "$SWIFT_DB_PASSWORD" ]; then
SWIFT_DB_PASSWORD=$(openssl rand -hex 15)