diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-02-06 19:08:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-02-06 19:08:46 +0000 |
| commit | 26b564dd06890862e268ea72b987bcb5ebf4bdb2 (patch) | |
| tree | 726b9e932f6e5e711583bf9556100d4a5ad15e7d /docker/swift | |
| parent | e91aafc75a656f108f97d6adb69fe132923b9119 (diff) | |
| parent | 91ca8d4b00c632bcf7a2a9903aa4cf584fee27e9 (diff) | |
| download | kolla-26b564dd06890862e268ea72b987bcb5ebf4bdb2.tar.gz kolla-26b564dd06890862e268ea72b987bcb5ebf4bdb2.zip | |
Merge "Cleanup required variables checks for all containers"
Diffstat (limited to 'docker/swift')
| -rw-r--r-- | docker/swift/swift-account/start.sh | 17 | ||||
| -rw-r--r-- | docker/swift/swift-container/start.sh | 17 | ||||
| -rw-r--r-- | docker/swift/swift-object/start.sh | 17 |
3 files changed, 18 insertions, 33 deletions
diff --git a/docker/swift/swift-account/start.sh b/docker/swift/swift-account/start.sh index 562fd4ca4..2fe6f2469 100644 --- a/docker/swift/swift-account/start.sh +++ b/docker/swift/swift-account/start.sh @@ -6,15 +6,10 @@ : ${SWIFT_KEYSTONE_USER:=swift} : ${ADMIN_TENANT_NAME:=admin} -if ! [ "$KEYSTONE_ADMIN_TOKEN" ]; then - echo "*** Missing KEYSTONE_ADMIN_TOKEN" >&2 - exit 1 -fi - -if ! [ "$DB_ROOT_PASSWORD" ]; then - echo "*** Missing DB_ROOT_PASSWORD" >&2 - exit 1 -fi +check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \ + SWIFT_ADMIN_PASSWORD +check_for_db +check_for_keystone if ! [ "$SWIFT_DB_PASSWORD" ]; then SWIFT_DB_PASSWORD=$(openssl rand -hex 15) @@ -23,7 +18,7 @@ fi sh /opt/swift/config-swift.sh account-server -mysql -h ${MARIADB_PORT_3306_TCP_ADDR} -u root \ +mysql -h ${MARIADB_SERVICE_HOST} -u root \ -p${DB_ROOT_PASSWORD} mysql <<EOF CREATE DATABASE IF NOT EXISTS ${SWIFT_DB_NAME}; GRANT ALL PRIVILEGES ON swift* TO @@ -31,7 +26,7 @@ GRANT ALL PRIVILEGES ON swift* TO EOF export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" -export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_PORT_35357_TCP_ADDR}:35357/v2.0" +export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:35357/v2.0" /bin/keystone user-create --name ${SWIFT_KEYSTONE_USER} --pass ${SWIFT_ADMIN_PASSWORD} /bin/keystone role-create --name ${SWIFT_KEYSTONE_USER} diff --git a/docker/swift/swift-container/start.sh b/docker/swift/swift-container/start.sh index e96471fb7..2a191e1d2 100644 --- a/docker/swift/swift-container/start.sh +++ b/docker/swift/swift-container/start.sh @@ -6,15 +6,10 @@ : ${SWIFT_KEYSTONE_USER:=swift} : ${ADMIN_TENANT_NAME:=admin} -if ! [ "$KEYSTONE_ADMIN_TOKEN" ]; then - echo "*** Missing KEYSTONE_ADMIN_TOKEN" >&2 - exit 1 -fi - -if ! [ "$DB_ROOT_PASSWORD" ]; then - echo "*** Missing DB_ROOT_PASSWORD" >&2 - exit 1 -fi +check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \ + SWIFT_ADMIN_PASSWORD +check_for_db +check_for_keystone if ! [ "$SWIFT_DB_PASSWORD" ]; then SWIFT_DB_PASSWORD=$(openssl rand -hex 15) @@ -23,7 +18,7 @@ fi sh /opt/swift/config-swift.sh container -mysql -h ${MARIADB_PORT_3306_TCP_ADDR} -u root \ +mysql -h ${MARIADB_SERVICE_HOST} -u root \ -p${DB_ROOT_PASSWORD} mysql <<EOF CREATE DATABASE IF NOT EXISTS ${SWIFT_DB_NAME}; GRANT ALL PRIVILEGES ON swift* TO @@ -31,7 +26,7 @@ GRANT ALL PRIVILEGES ON swift* TO EOF export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" -export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_PORT_35357_TCP_ADDR}:35357/v2.0" +export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:35357/v2.0" /bin/keystone user-create --name ${SWIFT_KEYSTONE_USER} --pass ${SWIFT_ADMIN_PASSWORD} /bin/keystone role-create --name ${SWIFT_KEYSTONE_USER} diff --git a/docker/swift/swift-object/start.sh b/docker/swift/swift-object/start.sh index 1546d8271..c43efc5fb 100644 --- a/docker/swift/swift-object/start.sh +++ b/docker/swift/swift-object/start.sh @@ -6,15 +6,10 @@ : ${SWIFT_KEYSTONE_USER:=swift} : ${ADMIN_TENANT_NAME:=admin} -if ! [ "$KEYSTONE_ADMIN_TOKEN" ]; then - echo "*** Missing KEYSTONE_ADMIN_TOKEN" >&2 - exit 1 -fi - -if ! [ "$DB_ROOT_PASSWORD" ]; then - echo "*** Missing DB_ROOT_PASSWORD" >&2 - exit 1 -fi +check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \ + SWIFT_ADMIN_PASSWORD +check_for_db +check_for_keystone if ! [ "$SWIFT_DB_PASSWORD" ]; then SWIFT_DB_PASSWORD=$(openssl rand -hex 15) @@ -23,7 +18,7 @@ fi sh /opt/swift/config-swift.sh engine -mysql -h ${MARIADB_PORT_3306_TCP_ADDR} -u root \ +mysql -h ${MARIADB_SERVICE_HOST} -u root \ -p${DB_ROOT_PASSWORD} mysql <<EOF CREATE DATABASE IF NOT EXISTS ${SWIFT_DB_NAME}; GRANT ALL PRIVILEGES ON swift* TO @@ -31,7 +26,7 @@ GRANT ALL PRIVILEGES ON swift* TO EOF export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" -export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_PORT_35357_TCP_ADDR}:35357/v2.0" +export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:35357/v2.0" /bin/keystone user-create --name ${SWIFT_KEYSTONE_USER} --pass ${SWIFT_ADMIN_PASSWORD} /bin/keystone role-create --name ${SWIFT_KEYSTONE_USER} |