diff options
| author | rthallisey <rhallise@redhat.com> | 2015-08-28 18:19:28 -0400 |
|---|---|---|
| committer | Ryan Hallisey <rhallise@redhat.com> | 2015-09-18 15:19:06 -0400 |
| commit | 180e8c3331fc9e839739512a92bdc57b6244bd8e (patch) | |
| tree | 0446679fb1238c57624c5e82816a6cc2afeb3911 /docker | |
| parent | a0bffb25810a634af5a7fde2d0cbb205813249de (diff) | |
| download | kolla-180e8c3331fc9e839739512a92bdc57b6244bd8e.tar.gz kolla-180e8c3331fc9e839739512a92bdc57b6244bd8e.zip | |
Replace config-external with a JSON file for Keystone
Change-Id: I4c403edb7cd16f587f30a313c1943f070512eda3
Partially-Implements: blueprint replace-config-external
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 |