Merge "Add missing barbican.conf support"

ansible/kolla-openstack.yml

@@ -105,6 +105,7 @@
           register: stat_result
           with_items:
             - { name: aodh, file: aodh.conf }
+            - { name: barbican, file: barbican.conf }
             - { name: blazar, file: blazar.conf }
             - { name: ceilometer, file: ceilometer.conf }
             - { name: cinder, file: cinder.conf }
@@ -214,6 +215,7 @@
         endpoint_override: "http://{% raw %}{{ api_interface_address }}{% endraw %}:{{ inspector_store_port }}"
       # Extra free-form user-provided configuration.
       kolla_extra_aodh: "{{ kolla_extra_config.aodh | default }}"
+      kolla_extra_barbican: "{{ kolla_extra_config.barbican | default }}"
       kolla_extra_blazar: "{{ kolla_extra_config.blazar | default }}"
       kolla_extra_ceilometer: "{{ kolla_extra_config.ceilometer | default }}"
       kolla_extra_cinder: "{{ kolla_extra_config.cinder | default }}"

ansible/roles/kolla-openstack/defaults/main.yml

@@ -26,6 +26,9 @@ kolla_extra_aodh:
 # Whether to enable Barbican.
 kolla_enable_barbican:
 
+# Free form extra configuration to append to barbican.conf.
+kolla_extra_barbican:
+
 ###############################################################################
 # Blazar configuration.
 

ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml

@@ -18,6 +18,10 @@ provisioner:
         kolla_extra_aodh: |
           [extra-aodh.conf]
           foo=bar
+        kolla_enable_barbican: true
+        kolla_extra_barbican: |
+          [extra-barbican.conf]
+          foo=bar
         kolla_enable_blazar: true
         kolla_extra_blazar: |
           [extra-blazar.conf]

ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py

@@ -28,6 +28,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
 @pytest.mark.parametrize(
     'path',
     ['aodh',
+     'barbican',
      'cinder',
      'cloudkitty',
      'designate',
@@ -63,6 +64,7 @@ def test_service_config_directory(host, path):
 @pytest.mark.parametrize(
     'path',
     ['aodh.conf',
+     'barbican.conf',
      'cinder.conf',
      'cloudkitty.conf',
      'designate.conf',

ansible/roles/kolla-openstack/tasks/config.yml

@@ -14,6 +14,7 @@
     mode: 0640
   with_items:
     - { src: aodh.conf.j2, dest: aodh.conf, enabled: "{{ kolla_enable_aodh }}" }
+    - { src: barbican.conf.j2, dest: barbican.conf, enabled: "{{ kolla_enable_barbican }}" }
     - { src: blazar.conf.j2, dest: blazar.conf, enabled: "{{ kolla_enable_blazar }}" }
     - { src: ceilometer.conf.j2, dest: ceilometer.conf, enabled: "{{ kolla_enable_ceilometer }}" }
     - { src: cinder.conf.j2, dest: cinder.conf, enabled: "{{ kolla_enable_cinder }}" }

ansible/roles/kolla-openstack/templates/barbican.conf.j2

+# {{ ansible_managed }}
+
+{% if kolla_extra_barbican %}
+#######################
+# Extra configuration
+#######################
+
+{{ kolla_extra_barbican }}
+{% endif %}

doc/source/configuration/reference/kolla-ansible.rst

@@ -585,6 +585,7 @@ which files are supported.
    ``aodh.conf``                   Aodh configuration.
    ``aodh/*``                      Extended Aodh configuration.
    ``backup.my.cnf``               Mariabackup configuration.
+   ``barbican.conf``               Barbican configuration.
    ``barbican/*``                  Extended Barbican configuration.
    ``blazar.conf``                 Blazar configuration.
    ``blazar/*``                    Extended Blazar configuration.

releasenotes/notes/add-support-for-barbican-conf-c15f0ab4294281cf.yaml

+---
+fixes:
+  - |
+    Adds support for a custom Barbican configuration file (``barbican.conf``),
+    as only extended configuration stored under a ``barbican`` folder was
+    supported.