openstack/kayobe
Code Issues Proposed changes

Support for untemplated dirs in kolla config

Browse Source 
Variable untemplated_dirs has been added to allow for
defining directories under kayobe/kolla/config which should be copied
instead of templated by kolla-openstack role.

This is needed to support custom themes for horizon -
change If9982c8e18be31772cb031ef72b7eebd4d768be5

Change-Id: I350f58c8a82f0f31608b34054e804c5c198d6806
This commit is contained in:
Jakub Darmach 2022-01-13 14:24:52 +01:00
parent abb2edd8a0
commit 35e0d76a96
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/kolla-openstack/tasks/config.yml
View File

@ -115,6 +115,7 @@
- item.0.item.enabled | bool - item.0.item.enabled | bool
- item.1.path | basename not in item.0.item.ignore | default([]) - item.1.path | basename not in item.0.item.ignore | default([])
- item.1.path | basename not in item.0.item.untemplated | default([]) - item.1.path | basename not in item.0.item.untemplated | default([])
- (item.1.path | dirname | relpath(item.0.item.src)).split("/")[0] not in item.0.item.untemplated_dirs | default([])
- name: Ensure untemplated extra configuration files exist - name: Ensure untemplated extra configuration files exist
copy: copy:
@ -128,7 +129,8 @@
when: when:
- item.0.item.enabled | bool - item.0.item.enabled | bool
- item.1.path | basename not in item.0.item.ignore | default([]) - item.1.path | basename not in item.0.item.ignore | default([])
- item.1.path | basename in item.0.item.untemplated | default([]) - (item.1.path | basename in item.0.item.untemplated | default([])) or
((item.1.path | dirname | relpath(item.0.item.src)).split("/")[0] in item.0.item.untemplated_dirs | default([]))
- name: Ensure unnecessary extra configuration files are absent - name: Ensure unnecessary extra configuration files are absent
file: file:

3
ansible/roles/kolla-openstack/vars/main.yml
View File

@ -98,6 +98,9 @@ kolla_openstack_custom_config:
dest: "{{ kolla_node_custom_config_path }}/horizon" dest: "{{ kolla_node_custom_config_path }}/horizon"
patterns: "*" patterns: "*"
enabled: "{{ kolla_enable_horizon }}" enabled: "{{ kolla_enable_horizon }}"
untemplated_dirs:
# Do not attempt to template themes directory.
- "themes"
# InfluxDB. # InfluxDB.
- src: "{{ kolla_extra_config_path }}/" - src: "{{ kolla_extra_config_path }}/"
dest: "{{ kolla_node_custom_config_path }}/" dest: "{{ kolla_node_custom_config_path }}/"

3
releasenotes/notes/add-support-for-custom-horizon-themes-5da1d99c1b8107b9.yaml Normal file
View File

@ -0,0 +1,3 @@
---
features:
- Adds support for custom Horizon themes.