aboutsummaryrefslogtreecommitdiff
path: root/docker/common/swift
diff options
context:
space:
mode:
authorSwapnil Kulkarni <me@coolsvap.net>2015-07-20 11:05:18 +0000
committerSwapnil Kulkarni <me@coolsvap.net>2015-07-29 18:08:50 +0000
commit1c147e4def0605e64a41916b71a9f2e675a0cbcf (patch)
tree11ec1e7ffbc134ee5c9feed4cecfaca0588a2acc /docker/common/swift
parent9f3b2ddf173bcab10cf6516702fce690c11431cf (diff)
downloadkolla-1c147e4def0605e64a41916b71a9f2e675a0cbcf.tar.gz
kolla-1c147e4def0605e64a41916b71a9f2e675a0cbcf.zip
Update service helper scripts for variable changes
- Updated the required variables to be sorted so that they are better visible one on each line - Removed variable defaults from each service scripts and added them to tools/genenv file which holds all default values Change-Id: Ia7b1b08ba3f963b46b81434ce84f476d56890a93 Closes-Bug: #1476494 Closes-Bug: #1467652
Diffstat (limited to 'docker/common/swift')
-rwxr-xr-xdocker/common/swift/swift-account/config-internal.sh9
-rwxr-xr-xdocker/common/swift/swift-container/config-internal.sh9
-rwxr-xr-xdocker/common/swift/swift-object/config-internal.sh9
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