Merge "Replace config-external - horizon"

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"

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']

ansible/roles/horizon/templates/horizon.json.j2

+{% 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"
+        }
+    ]
+}

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