diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-23 19:30:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-23 19:30:34 +0000 |
| commit | 274d808ff9a82ba19a18b6409f1d8ee57deadc88 (patch) | |
| tree | aead2006d1900e7bc7b00a4b4b515be88cb71b52 /docker | |
| parent | 6e94b97dd6f0f1639c2efd167bcd028658568553 (diff) | |
| parent | 180e8c3331fc9e839739512a92bdc57b6244bd8e (diff) | |
| download | kolla-274d808ff9a82ba19a18b6409f1d8ee57deadc88.tar.gz kolla-274d808ff9a82ba19a18b6409f1d8ee57deadc88.zip | |
Merge "Replace config-external with a JSON file for Keystone"
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/keystone/start.sh | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh index 0f1dc7db0..91c95517c 100755 --- a/docker/keystone/start.sh +++ b/docker/keystone/start.sh @@ -7,24 +7,18 @@ source /opt/kolla/kolla-common.sh if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \ "${KOLLA_BASE_DISTRO}" == "debian" ]]; then - CMD="/usr/sbin/apache2" - ARGS="-DFOREGROUND" - # Loading Apache2 ENV variables source /etc/apache2/envvars -else - CMD="/usr/sbin/httpd" - ARGS="-DFOREGROUND" fi -# Execute config strategy -set_configs +# Generate run command +python /opt/kolla/set_configs.py +CMD=$(cat /run_command) # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then su -s /bin/sh -c "keystone-manage db_sync" keystone - # Start the api to set initial endpoint and users with the admin_token $CMD sleep 5 @@ -42,4 +36,6 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then exit 0 fi +ARGS="-DFOREGROUND" +echo "Running command: ${CMD} ${ARGS}" exec $CMD $ARGS |