diff options
| author | Sam Yaple <sam@yaple.net> | 2015-09-25 10:06:05 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-09-25 11:06:35 +0000 |
| commit | 4d5186473ec0ed8b350052049f38f969644f36d5 (patch) | |
| tree | bc1a4ba64fa3dbc3d2871240ea30240fccfe0e61 /docker | |
| parent | 89ecfc164ed92696de4c5cd2c0f90f23c1ad3784 (diff) | |
| download | kolla-4d5186473ec0ed8b350052049f38f969644f36d5.tar.gz kolla-4d5186473ec0ed8b350052049f38f969644f36d5.zip | |
Replace config-external - horizon
Change-Id: I72577ee7dd2dfbd199ca91f6f33f970fe1c9c89f
Partially-Implements: blueprint replace-config-external
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/horizon/start.sh | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/docker/horizon/start.sh b/docker/horizon/start.sh index 096326a3a..535f06b82 100755 --- a/docker/horizon/start.sh +++ b/docker/horizon/start.sh @@ -7,17 +7,12 @@ 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) -exec $CMD $ARGS +exec $CMD |