Merge pull request #94 from stackhpc/fix/concat-ini-files

Fix for concating ini files instead of config merge
stackhpc · Feb 16, 2023 · cf731a6 · cf731a6
2 parents 3dfa3e0 + dddf6c6
commit cf731a6
Show file tree

Hide file tree

Showing 33 changed files with 37 additions and 34 deletions.
diff --git a/ansible/roles/dell-switch-bmp/templates/dell-switch-bmp.conf.j2 b/ansible/roles/dell-switch-bmp/templates/dell-switch-bmp.conf.j2
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 # This file provides dnsmasq configuration for Dell Switches using Bare Metal
 # Provisioning (BMP).

diff --git a/ansible/roles/kolla-ansible/templates/globals.yml.j2 b/ansible/roles/kolla-ansible/templates/globals.yml.j2
@@ -1,5 +1,5 @@
 ---
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 # You can use this file to override _any_ variable throughout Kolla.
 # Additional options can be found in the

diff --git a/ansible/roles/kolla-build/templates/kolla-build.conf.j2 b/ansible/roles/kolla-build/templates/kolla-build.conf.j2
@@ -1,5 +1,5 @@
 # FIXME: doesn't work
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 [DEFAULT]
 

diff --git a/ansible/roles/kolla-build/templates/template-override.j2.j2 b/ansible/roles/kolla-build/templates/template-override.j2.j2
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% raw %}
 {% extends parent_template %}

diff --git a/ansible/roles/kolla-openstack/tasks/config.yml b/ansible/roles/kolla-openstack/tasks/config.yml
@@ -67,8 +67,11 @@
   with_items: "{{ kolla_custom_config_info['copy'] }}"
 
 - name: Ensure merged ini extra configuration files exist
-  merge_configs:
-    sources: "{{ item.sources }}"
+  copy:
+    content: |
+       {% for path in item.sources %} 
+       {{ lookup('template', path) }}
+       {% endfor %}
     dest: "{{ item.dest }}"
     mode: 0640
   with_items: "{{ kolla_custom_config_info.merge_ini }}"

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/aodh.conf b/ansible/roles/kolla-openstack/templates/kolla/config/aodh.conf
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% if kolla_extra_aodh %}
 #######################

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/backup.my.cnf b/ansible/roles/kolla-openstack/templates/kolla/config/backup.my.cnf
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% if kolla_extra_mariabackup %}
 #######################

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/barbican.conf b/ansible/roles/kolla-openstack/templates/kolla/config/barbican.conf
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% if kolla_extra_barbican %}
 #######################

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/blazar.conf b/ansible/roles/kolla-openstack/templates/kolla/config/blazar.conf
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% if kolla_extra_blazar %}
 #######################

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/ceilometer.conf b/ansible/roles/kolla-openstack/templates/kolla/config/ceilometer.conf
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% if kolla_extra_ceilometer %}
 #######################

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/cinder.conf b/ansible/roles/kolla-openstack/templates/kolla/config/cinder.conf
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% if kolla_extra_cinder %}
 #######################

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/cloudkitty.conf b/ansible/roles/kolla-openstack/templates/kolla/config/cloudkitty.conf
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% if kolla_extra_cloudkitty %}
 #######################

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/designate.conf b/ansible/roles/kolla-openstack/templates/kolla/config/designate.conf
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% if kolla_extra_designate %}
 #######################

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/galera.cnf b/ansible/roles/kolla-openstack/templates/kolla/config/galera.cnf
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% if kolla_extra_mariadb %}
 #######################

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/glance.conf b/ansible/roles/kolla-openstack/templates/kolla/config/glance.conf
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% if kolla_extra_glance %}
 #######################

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/global.conf b/ansible/roles/kolla-openstack/templates/kolla/config/global.conf
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% if kolla_extra_global %}
 #######################

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/gnocchi.conf b/ansible/roles/kolla-openstack/templates/kolla/config/gnocchi.conf
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% if kolla_extra_gnocchi %}
 #######################

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/grafana.ini b/ansible/roles/kolla-openstack/templates/kolla/config/grafana.ini
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% if kolla_extra_grafana %}
 #######################

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/heat.conf b/ansible/roles/kolla-openstack/templates/kolla/config/heat.conf
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% if kolla_extra_heat %}
 #######################

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/ironic.conf b/ansible/roles/kolla-openstack/templates/kolla/config/ironic.conf
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 [DEFAULT]
 enabled_hardware_types: {{ kolla_ironic_enabled_hardware_types | join(',') }}

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/kafka.server.properties b/ansible/roles/kolla-openstack/templates/kolla/config/kafka.server.properties
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% if kolla_extra_kafka %}
 #######################

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/keystone.conf b/ansible/roles/kolla-openstack/templates/kolla/config/keystone.conf
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 {% if kolla_extra_keystone %}
 #######################
 # Extra configuration

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/magnum.conf b/ansible/roles/kolla-openstack/templates/kolla/config/magnum.conf
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% if kolla_extra_magnum %}
 #######################

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/manila.conf b/ansible/roles/kolla-openstack/templates/kolla/config/manila.conf
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% if kolla_extra_manila %}
 #######################

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/masakari.conf b/ansible/roles/kolla-openstack/templates/kolla/config/masakari.conf
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% if kolla_extra_masakari %}
 #######################

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/murano.conf b/ansible/roles/kolla-openstack/templates/kolla/config/murano.conf
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% if kolla_extra_murano %}
 #######################

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/neutron.conf b/ansible/roles/kolla-openstack/templates/kolla/config/neutron.conf
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% if kolla_extra_neutron %}
 #######################

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/neutron/ml2_conf.ini b/ansible/roles/kolla-openstack/templates/kolla/config/neutron/ml2_conf.ini
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 [ml2]
 {% if kolla_neutron_ml2_mechanism_drivers %}

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/nova.conf b/ansible/roles/kolla-openstack/templates/kolla/config/nova.conf
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% if kolla_extra_nova %}
 #######################

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/octavia.conf b/ansible/roles/kolla-openstack/templates/kolla/config/octavia.conf
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% if kolla_extra_octavia %}
 #######################

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/sahara.conf b/ansible/roles/kolla-openstack/templates/kolla/config/sahara.conf
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% if kolla_extra_sahara %}
 #######################

diff --git a/ansible/roles/kolla-openstack/templates/kolla/config/zookeeper.cfg b/ansible/roles/kolla-openstack/templates/kolla/config/zookeeper.cfg
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% if kolla_extra_zookeeper %}
 #######################

diff --git a/ansible/roles/public-openrc/templates/public-openrc.sh.j2 b/ansible/roles/public-openrc/templates/public-openrc.sh.j2
@@ -1,4 +1,4 @@
-# {% raw %}{{ ansible_managed }}{% endraw %}
+
 
 {% for line in (admin_openrc.content | b64decode).splitlines() %}
 {% if "export OS_AUTH_URL" in line %}