From 2185be008ecd6825b24101253b6ae8d1316189de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20J=C3=A4ger?= <uwe.jaeger@valiton.com>
Date: Wed, 17 Jan 2024 13:59:12 +0100
Subject: [PATCH] Allow customizing of Skyline configuration

Change-Id: I84cc5ce25da2fcfe4f284d8b3197f40d3a6d7ce1
---
 ansible/roles/skyline/tasks/config.yml        | 34 ++++++++++++-------
 ...ine-customize-config-a877dc747028bf07.yaml |  8 +++++
 2 files changed, 30 insertions(+), 12 deletions(-)
 create mode 100644 releasenotes/notes/skyline-customize-config-a877dc747028bf07.yaml

diff --git a/ansible/roles/skyline/tasks/config.yml b/ansible/roles/skyline/tasks/config.yml
index 13d620d2a8..82ab5aada5 100644
--- a/ansible/roles/skyline/tasks/config.yml
+++ b/ansible/roles/skyline/tasks/config.yml
@@ -17,8 +17,10 @@
     - kolla_copy_ca_into_containers | bool or skyline_enable_tls_backend | bool
 
 - name: Copying over skyline.yaml files for services
-  template:
-    src: "skyline.yaml.j2"
+  merge_yaml:
+    sources:
+      - "{{ role_path }}/templates/skyline.yaml.j2"
+      - "{{ node_custom_config }}/skyline/skyline.yaml"
     dest: "{{ node_config_directory }}/{{ item.key }}/skyline.yaml"
     mode: "0660"
   become: true
@@ -30,30 +32,38 @@
     - "Restart {{ item.key }} container"
 
 - name: Copying over gunicorn.py files for services
+  vars:
+    skyline_apiserver: "{{ skyline_services['skyline-apiserver'] }}"
   template:
-    src: "gunicorn.py.j2"
-    dest: "{{ node_config_directory }}/{{ item.key }}/gunicorn.py"
+    src: "{{ item }}"
+    dest: "{{ node_config_directory }}/skyline-apiserver/gunicorn.py"
     mode: "0660"
   become: true
   when:
     - inventory_hostname in groups['skyline-apiserver']
-    - item.value.enabled | bool
-  with_dict: "{{ skyline_services }}"
+    - skyline_apiserver.enabled | bool
+  with_first_found:
+    - "{{ node_custom_config }}/skyline/gunicorn.py"
+    - "gunicorn.py.j2"
   notify:
-    - "Restart {{ item.key }} container"
+    - "Restart skyline-apiserver container"
 
 - name: Copying over nginx.conf files for services
+  vars:
+    skyline_console: "{{ skyline_services['skyline-console'] }}"
   template:
-    src: "nginx.conf.j2"
-    dest: "{{ node_config_directory }}/{{ item.key }}/nginx.conf"
+    src: "{{ item }}"
+    dest: "{{ node_config_directory }}/skyline-console/nginx.conf"
     mode: "0660"
   become: true
   when:
     - inventory_hostname in groups['skyline-console']
-    - item.value.enabled | bool
-  with_dict: "{{ skyline_services }}"
+    - skyline_console.enabled | bool
+  with_first_found:
+    - "{{ node_custom_config }}/skyline/nginx.conf"
+    - "nginx.conf.j2"
   notify:
-    - "Restart {{ item.key }} container"
+    - "Restart skyline-console container"
 
 - name: Copying over config.json files for services
   template:
diff --git a/releasenotes/notes/skyline-customize-config-a877dc747028bf07.yaml b/releasenotes/notes/skyline-customize-config-a877dc747028bf07.yaml
new file mode 100644
index 0000000000..dab6610de6
--- /dev/null
+++ b/releasenotes/notes/skyline-customize-config-a877dc747028bf07.yaml
@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    Allow overriding of Skyline configuration files by supplying your own
+    version of nginx.conf for Skyline Console, gunicorn.py and skyline.yaml
+    for  Skyline API Server. Place the files in the skyline subfolder of
+    your Kolla config directory, skyline.yaml will be merged with the
+    Kolla provided version.