From a656aedc8e68ab90e39bc375469579fcb389bf20 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Fri, 7 Aug 2015 18:41:23 +0000
Subject: [PATCH] Remove config-internal for Horizon

Change-Id: Iafde0b26008ad93f9a956192da73d59ccb593104
Partially-implements: blueprint remove-config-internal
---
 docker/centos/binary/horizon/Dockerfile       |  4 +--
 .../centos/binary/horizon/config-internal.sh  |  1 -
 docker/centos/source/horizon/Dockerfile       |  6 ++--
 .../centos/source/horizon/config-internal.sh  |  1 -
 docker/common/horizon/config-internal.sh      | 34 -------------------
 docker/common/horizon/start.sh                |  2 +-
 6 files changed, 5 insertions(+), 43 deletions(-)
 delete mode 120000 docker/centos/binary/horizon/config-internal.sh
 delete mode 120000 docker/centos/source/horizon/config-internal.sh
 delete mode 100755 docker/common/horizon/config-internal.sh

diff --git a/docker/centos/binary/horizon/Dockerfile b/docker/centos/binary/horizon/Dockerfile
index 60e625597f..dfd0f0ff09 100644
--- a/docker/centos/binary/horizon/Dockerfile
+++ b/docker/centos/binary/horizon/Dockerfile
@@ -11,7 +11,7 @@ RUN yum -y install \
 # The chown is required because of this packaging bug:
 # https://bugzilla.redhat.com/show_bug.cgi?id=1219006
 
-COPY config-internal.sh config-external.sh /opt/kolla/
-COPY ./start.sh /start.sh
+COPY config-external.sh /opt/kolla/
+COPY start.sh /
 
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/horizon/config-internal.sh b/docker/centos/binary/horizon/config-internal.sh
deleted file mode 120000
index 82e83c796f..0000000000
--- a/docker/centos/binary/horizon/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/horizon/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/horizon/Dockerfile b/docker/centos/source/horizon/Dockerfile
index 96889c916c..bf3445cfa6 100644
--- a/docker/centos/source/horizon/Dockerfile
+++ b/docker/centos/source/horizon/Dockerfile
@@ -23,9 +23,7 @@ RUN cd /horizon \
 # The chown is required because of this packaging bug:
 # https://bugzilla.redhat.com/show_bug.cgi?id=1219006
 
-COPY config-internal.sh config-external.sh /opt/kolla/
-
-COPY ./start.sh /start.sh
-COPY config-internal.sh config-external.sh /opt/kolla/
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/source/horizon/config-internal.sh b/docker/centos/source/horizon/config-internal.sh
deleted file mode 120000
index 82e83c796f..0000000000
--- a/docker/centos/source/horizon/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/horizon/config-internal.sh
\ No newline at end of file
diff --git a/docker/common/horizon/config-internal.sh b/docker/common/horizon/config-internal.sh
deleted file mode 100755
index 0e53e2738f..0000000000
--- a/docker/common/horizon/config-internal.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-set -e
-
-. /opt/kolla/kolla-common.sh
-
-fail_unless_os_service_running keystone
-fail_unless_os_service_running glance
-fail_unless_os_service_running nova
-
-export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
-export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:35357/v2.0"
-
-cfg=/etc/openstack-dashboard/local_settings
-httpdcfg=/etc/httpd/conf.d/openstack-dashboard.conf
-
-sed -ri 's/ALLOWED_HOSTS = \['\''horizon.example.com'\'', '\''localhost'\''\]/ALLOWED_HOSTS = \['\''*'\'', \]/' /etc/openstack-dashboard/local_settings
-
-sed -ri 's/OPENSTACK_KEYSTONE_URL = \"http:\/\/%s:5000\/v2.0\" % OPENSTACK_HOST/OPENSTACK_KEYSTONE_URL = \"http:\/\/'"$KEYSTONE_PUBLIC_SERVICE_HOST"':5000\/v2.0\"/' /etc/openstack-dashboard/local_settings
-
-sed -ri 's/OPENSTACK_HOST = \"127.0.0.1\"/OPENSTACK_HOST = \"'"$KEYSTONE_PUBLIC_SERVICE_HOST"'\" /' /etc/openstack-dashboard/local_settings
-
-# Make sure we launch horizon using the default value for WEBROOT, which is
-# '/'.
-sed -ri '/^WEBROOT =.+/d' $cfg
-sed -ri 's,^(WSGIScriptAlias) /dashboard (/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi),\1 / \2,' $httpdcfg
-sed -ri 's,^(Alias /dashboard)(/static /usr/share/openstack-dashboard/static),Alias \2,' $httpdcfg
-
-# This step is required because of:
-# https://bugzilla.redhat.com/show_bug.cgi?id=1220070
-# Running this in the Dockerfile didn't fix the HTTP/500 as a result of the
-# missing compress action.
-python /usr/share/openstack-dashboard/manage.py compress
-
-/usr/sbin/httpd -DFOREGROUND
diff --git a/docker/common/horizon/start.sh b/docker/common/horizon/start.sh
index b56d7bc6c3..2470bda779 100755
--- a/docker/common/horizon/start.sh
+++ b/docker/common/horizon/start.sh
@@ -8,7 +8,7 @@ ARGS="-DFOREGROUND"
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Config-internal script exec out of this function, it does not return here.
+# Execute config strategy
 set_configs
 
 exec $CMD $ARGS