From 4d5186473ec0ed8b350052049f38f969644f36d5 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Fri, 25 Sep 2015 10:06:05 +0000
Subject: [PATCH] Replace config-external - horizon

Change-Id: I72577ee7dd2dfbd199ca91f6f33f970fe1c9c89f
Partially-Implements: blueprint replace-config-external
---
 ansible/roles/horizon/tasks/config.yml        |  5 +++++
 ansible/roles/horizon/tasks/start.yml         |  2 +-
 .../roles/horizon/templates/horizon.json.j2   | 20 +++++++++++++++++++
 docker/horizon/start.sh                       | 13 ++++--------
 4 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 ansible/roles/horizon/templates/horizon.json.j2

diff --git a/ansible/roles/horizon/tasks/config.yml b/ansible/roles/horizon/tasks/config.yml
index b74c5aa8e3..87ce2976e5 100644
--- a/ansible/roles/horizon/tasks/config.yml
+++ b/ansible/roles/horizon/tasks/config.yml
@@ -5,6 +5,11 @@
     state: "directory"
     recurse: "yes"
 
+- name: Copying horizon JSON configuration file
+  template:
+    src: "horizon.json.j2"
+    dest: "{{ node_config_directory }}/horizon/config.json"
+
 - name: Copying over config(s)
   template:
     src: "horizon.conf.j2"
diff --git a/ansible/roles/horizon/tasks/start.yml b/ansible/roles/horizon/tasks/start.yml
index ff6adfdf6f..3856050a33 100644
--- a/ansible/roles/horizon/tasks/start.yml
+++ b/ansible/roles/horizon/tasks/start.yml
@@ -13,7 +13,7 @@
     insecure_registry: "{{ docker_insecure_registry }}"
     name: horizon
     image: "{{ horizon_image_full }}"
-    volumes: "{{ node_config_directory }}/horizon/:/opt/kolla/horizon/:ro"
+    volumes: "{{ node_config_directory }}/horizon/:/opt/kolla/config_files/:ro"
     env:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
   when: inventory_hostname in groups['horizon']
diff --git a/ansible/roles/horizon/templates/horizon.json.j2 b/ansible/roles/horizon/templates/horizon.json.j2
new file mode 100644
index 0000000000..a3bdef0d1a
--- /dev/null
+++ b/ansible/roles/horizon/templates/horizon.json.j2
@@ -0,0 +1,20 @@
+{% set apache_cmd = 'apache2' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd' %}
+{% set apache_dir = 'apache2/conf-enabled' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd/conf.d' %}
+{% set apache_file = '000-default.conf' if kolla_base_distro in ['ubuntu', 'debian'] else 'horizon.conf' %}
+{
+    "command": "/usr/sbin/{{ apache_cmd }} -DFOREGROUND",
+    "config_files": [
+        {
+            "source": "/opt/kolla/config_files/horizon.conf",
+            "dest": "/etc/{{ apache_dir }}/{{ apache_file }}",
+            "owner": "horizon",
+            "perm": "0644"
+        },
+        {
+            "source": "/opt/kolla/config_files/local_settings",
+            "dest": "/etc/openstack-dashboard/local_settings",
+            "owner": "horizon",
+            "perm": "0644"
+        }
+    ]
+}
diff --git a/docker/horizon/start.sh b/docker/horizon/start.sh
index 096326a3af..535f06b822 100755
--- a/docker/horizon/start.sh
+++ b/docker/horizon/start.sh
@@ -7,17 +7,12 @@ 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
+# Generate run command
+python /opt/kolla/set_configs.py
+CMD=$(cat /run_command)
 
-exec $CMD $ARGS
+exec $CMD