aboutsummaryrefslogtreecommitdiff
path: root/docker/common/keystone
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/keystone
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/keystone')
-rwxr-xr-xdocker/common/keystone/config-internal.sh42
1 files changed, 9 insertions, 33 deletions
diff --git a/docker/common/keystone/config-internal.sh b/docker/common/keystone/config-internal.sh
index 2d522b699..d2e959655 100755
--- a/docker/common/keystone/config-internal.sh
+++ b/docker/common/keystone/config-internal.sh
@@ -6,43 +6,19 @@ set -e
echo "Running the kolla-common script"
. /opt/kolla/kolla-common.sh
-# Credentials, token, etc..
-: ${ADMIN_USER:=admin}
-: ${ADMIN_USER_PASSWORD:=password}
-: ${ADMIN_TENANT_NAME:=admin}
-: ${KEYSTONE_USER:=keystone}
-: ${KEYSTONE_ADMIN_PASSWORD:=password}
-: ${KEYSTONE_ADMIN_TOKEN:=changeme}
-# DB Settings
-: ${INIT_KEYSTONE_DB:=true}
-: ${KEYSTONE_DB_NAME:=keystone}
-: ${KEYSTONE_DB_USER:=keystone}
-: ${DB_ROOT_PASSWORD:=password}
-: ${MARIADB_SERVICE_HOST:=$PUBLIC_IP}
-: ${KEYSTONE_DB_PASSWORD:=password}
-# Service Addresses/Ports/Version
-: ${KEYSTONE_PUBLIC_SERVICE_HOST:=$PUBLIC_IP}
-: ${KEYSTONE_ADMIN_SERVICE_HOST:=$PUBLIC_IP}
-: ${KEYSTONE_PUBLIC_SERVICE_PORT:=5000}
-: ${KEYSTONE_ADMIN_SERVICE_PORT:=35357}
-: ${KEYSTONE_API_VERSION:=2.0}
-# Logging
-: ${LOG_FILE:=/var/log/keystone/keystone.log}
-: ${VERBOSE_LOGGING:=true}
-: ${DEBUG_LOGGING:=false}
-: ${USE_STDERR:=false}
-# Token provider, driver, etc..
-: ${TOKEN_PROVIDER:=uuid}
-: ${TOKEN_DRIVER:=sql}
-
## Check DB connectivity and required variables
echo "Checking connectivity to the DB"
fail_unless_db
echo "Checking for required variables"
-check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_DB_PASSWORD \
- KEYSTONE_ADMIN_PASSWORD ADMIN_TENANT_NAME \
- KEYSTONE_PUBLIC_SERVICE_HOST KEYSTONE_ADMIN_SERVICE_HOST \
- PUBLIC_IP INIT_KEYSTONE_DB
+check_required_vars ADMIN_TENANT_NAME \
+ INIT_KEYSTONE_DB \
+ KEYSTONE_ADMIN_PASSWORD \
+ KEYSTONE_ADMIN_SERVICE_HOST \
+ KEYSTONE_ADMIN_TOKEN \
+ KEYSTONE_DB_PASSWORD \
+ KEYSTONE_PUBLIC_SERVICE_HOST \
+ PUBLIC_IP
+
dump_vars
# Setup the Keystone DB