From 4d5186473ec0ed8b350052049f38f969644f36d5 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Fri, 25 Sep 2015 10:06:05 +0000 Subject: Replace config-external - horizon Change-Id: I72577ee7dd2dfbd199ca91f6f33f970fe1c9c89f Partially-Implements: blueprint replace-config-external --- docker/horizon/start.sh | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'docker') 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 -- cgit v1.2.3