diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-27 18:09:20 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-28 00:50:29 -0700 |
| commit | bd32c7a2dc0b10b0be209f969b2f8b4ad87c55f7 (patch) | |
| tree | ea6a5c11aeb26804e8e69a5410fd73f5a19bec04 | |
| parent | 43327444cae3c8390791302d60fac6da31a4c9f5 (diff) | |
| download | kolla-bd32c7a2dc0b10b0be209f969b2f8b4ad87c55f7.tar.gz kolla-bd32c7a2dc0b10b0be209f969b2f8b4ad87c55f7.zip | |
Move scripts for horizon to docker_templates
Change-Id: If260f47ea3e4f9917cf20a6e2013cc81bfa5fc83
Partially-Implements: blueprint remove-docker-dir
| -rw-r--r-- | docker/common/horizon/config-external.sh | 25 | ||||
| -rwxr-xr-x | docker/common/horizon/start.sh | 23 | ||||
| -rw-r--r--[l---------] | docker_templates/horizon/config-external.sh | 26 | ||||
| -rwxr-xr-x[l---------] | docker_templates/horizon/start.sh | 24 |
4 files changed, 48 insertions, 50 deletions
diff --git a/docker/common/horizon/config-external.sh b/docker/common/horizon/config-external.sh deleted file mode 100644 index 8e9fc47a0..000000000 --- a/docker/common/horizon/config-external.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/horizon/local_settings" -TARGET="/etc/openstack-dashboard/local_settings" -OWNER="horizon" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi - -if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \ - "${KOLLA_BASE_DISTRO}" == "debian" ]]; then - SOURCE="/opt/kolla/horizon/horizon.conf" - TARGET="/etc/apache2/sites-enabled/000-default.conf" -else - SOURCE="/opt/kolla/horizon/horizon.conf" - TARGET="/etc/httpd/sites.d/horizon.conf" -fi - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/horizon/start.sh b/docker/common/horizon/start.sh deleted file mode 100755 index 096326a3a..000000000 --- a/docker/common/horizon/start.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -set -o errexit - -# Loading common functions -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 - -exec $CMD $ARGS diff --git a/docker_templates/horizon/config-external.sh b/docker_templates/horizon/config-external.sh index 32f0838d6..8e9fc47a0 120000..100644 --- a/docker_templates/horizon/config-external.sh +++ b/docker_templates/horizon/config-external.sh @@ -1 +1,25 @@ -../../docker/common/horizon/config-external.sh
\ No newline at end of file +#!/bin/bash +SOURCE="/opt/kolla/horizon/local_settings" +TARGET="/etc/openstack-dashboard/local_settings" +OWNER="horizon" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi + +if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \ + "${KOLLA_BASE_DISTRO}" == "debian" ]]; then + SOURCE="/opt/kolla/horizon/horizon.conf" + TARGET="/etc/apache2/sites-enabled/000-default.conf" +else + SOURCE="/opt/kolla/horizon/horizon.conf" + TARGET="/etc/httpd/sites.d/horizon.conf" +fi + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi diff --git a/docker_templates/horizon/start.sh b/docker_templates/horizon/start.sh index 16347cc9b..096326a3a 120000..100755 --- a/docker_templates/horizon/start.sh +++ b/docker_templates/horizon/start.sh @@ -1 +1,23 @@ -../../docker/common/horizon/start.sh
\ No newline at end of file +#!/bin/bash + +set -o errexit + +# Loading common functions +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 + +exec $CMD $ARGS |