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