diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-30 18:54:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-30 18:54:43 +0000 |
| commit | 731d5205cbed74028bda0883a5432afc476605b6 (patch) | |
| tree | 38a04d3f8f1d817fc08931d23df29fff416c82ab /docker/common/swift | |
| parent | 15eb390ab307885943280a4b5d1287dc580517aa (diff) | |
| parent | 1c147e4def0605e64a41916b71a9f2e675a0cbcf (diff) | |
| download | kolla-731d5205cbed74028bda0883a5432afc476605b6.tar.gz kolla-731d5205cbed74028bda0883a5432afc476605b6.zip | |
Merge "Update service helper scripts for variable changes"
Diffstat (limited to 'docker/common/swift')
| -rwxr-xr-x | docker/common/swift/swift-account/config-internal.sh | 9 | ||||
| -rwxr-xr-x | docker/common/swift/swift-container/config-internal.sh | 9 | ||||
| -rwxr-xr-x | docker/common/swift/swift-object/config-internal.sh | 9 |
3 files changed, 6 insertions, 21 deletions
diff --git a/docker/common/swift/swift-account/config-internal.sh b/docker/common/swift/swift-account/config-internal.sh index bf86830f9..c0531f46e 100755 --- a/docker/common/swift/swift-account/config-internal.sh +++ b/docker/common/swift/swift-account/config-internal.sh @@ -1,12 +1,7 @@ #!/bin/bash -: ${SWIFT_DB_USER:=swift} -: ${SWIFT_DB_NAME:=swift} -: ${KEYSTONE_AUTH_PROTOCOL:=http} -: ${SWIFT_KEYSTONE_USER:=swift} -: ${ADMIN_TENANT_NAME:=admin} - -check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \ +check_required_vars KEYSTONE_ADMIN_SERVICE_HOST \ + KEYSTONE_ADMIN_TOKEN \ SWIFT_ADMIN_PASSWORD fail_unless_db fail_unless_os_service_running keystone diff --git a/docker/common/swift/swift-container/config-internal.sh b/docker/common/swift/swift-container/config-internal.sh index 42d4ccf35..a11c10561 100755 --- a/docker/common/swift/swift-container/config-internal.sh +++ b/docker/common/swift/swift-container/config-internal.sh @@ -1,12 +1,7 @@ #!/bin/bash -: ${SWIFT_DB_USER:=swift} -: ${SWIFT_DB_NAME:=swift} -: ${KEYSTONE_AUTH_PROTOCOL:=http} -: ${SWIFT_KEYSTONE_USER:=swift} -: ${ADMIN_TENANT_NAME:=admin} - -check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \ +check_required_vars KEYSTONE_ADMIN_SERVICE_HOST \ + KEYSTONE_ADMIN_TOKEN \ SWIFT_ADMIN_PASSWORD fail_unless_db fail_unless_os_service_running keystone diff --git a/docker/common/swift/swift-object/config-internal.sh b/docker/common/swift/swift-object/config-internal.sh index 7ed97536e..5931e89d6 100755 --- a/docker/common/swift/swift-object/config-internal.sh +++ b/docker/common/swift/swift-object/config-internal.sh @@ -1,12 +1,7 @@ #!/bin/bash -: ${SWIFT_DB_USER:=swift} -: ${SWIFT_DB_NAME:=swift} -: ${KEYSTONE_AUTH_PROTOCOL:=http} -: ${SWIFT_KEYSTONE_USER:=swift} -: ${ADMIN_TENANT_NAME:=admin} - -check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \ +check_required_vars KEYSTONE_ADMIN_SERVICE_HOST \ + KEYSTONE_ADMIN_TOKEN \ SWIFT_ADMIN_PASSWORD fail_unless_db fail_unless_os_service_running keystone |