diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-25 13:50:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-25 13:50:41 +0000 |
| commit | 6cf67a05e1ba0e155fb4a40692dd24211ee790b4 (patch) | |
| tree | cf791b6a8c5e77215cbe1a67705472b8f45ececf /docker | |
| parent | 00f35e55907d54bacd291ebaab684d7b26420c37 (diff) | |
| parent | 4d5186473ec0ed8b350052049f38f969644f36d5 (diff) | |
| download | kolla-6cf67a05e1ba0e155fb4a40692dd24211ee790b4.tar.gz kolla-6cf67a05e1ba0e155fb4a40692dd24211ee790b4.zip | |
Merge "Replace config-external - horizon"
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 |