diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-09 19:09:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-09 19:09:50 +0000 |
| commit | 7693df4d3a212c605276610cce09a75996ae42e1 (patch) | |
| tree | f8c877efca84a733dee2431a845049482df677bc | |
| parent | 3aede4ceffbe38f01bd0f35d347c383a8b704a6f (diff) | |
| parent | c7cb78c114c64cde052d24dc671e352ede496b21 (diff) | |
| download | kolla-7693df4d3a212c605276610cce09a75996ae42e1.tar.gz kolla-7693df4d3a212c605276610cce09a75996ae42e1.zip | |
Merge "horizon start scripts need update for cmd & args"
| -rw-r--r-- | docker/common/horizon/config-external.sh | 1 | ||||
| -rwxr-xr-x | docker/common/horizon/start.sh | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/docker/common/horizon/config-external.sh b/docker/common/horizon/config-external.sh index 519a28b06..843047d8c 100644 --- a/docker/common/horizon/config-external.sh +++ b/docker/common/horizon/config-external.sh @@ -1,7 +1,6 @@ #!/bin/bash SOURCE="/etc/openstack-dashboard/local_settings" TARGET="/etc/openstack-dashboard/local_settings" - OWNER="horizon" if [[ -f "$SOURCE" ]]; then diff --git a/docker/common/horizon/start.sh b/docker/common/horizon/start.sh index 756c6311a..b56d7bc6c 100755 --- a/docker/common/horizon/start.sh +++ b/docker/common/horizon/start.sh @@ -2,8 +2,8 @@ set -o errexit -CMD="/usr/sbin/httpd -DFOREGROUND" -ARGS="" +CMD="/usr/sbin/httpd" +ARGS="-DFOREGROUND" # Loading common functions. source /opt/kolla/kolla-common.sh |