Move scripts for horizon to docker_templates

Change-Id: If260f47ea3e4f9917cf20a6e2013cc81bfa5fc83
Partially-Implements: blueprint remove-docker-dir
This commit is contained in:
Steven Dake 2015-08-27 18:09:20 -07:00
parent 43327444ca
commit bd32c7a2dc
4 changed files with 48 additions and 50 deletions
docker/common/horizon
docker_templates/horizon

@ -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

@ -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

@ -1 +0,0 @@
../../docker/common/horizon/config-external.sh

@ -0,0 +1,25 @@
#!/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

@ -1 +0,0 @@
../../docker/common/horizon/start.sh

@ -0,0 +1,23 @@
#!/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