Merge "Add support for custom Blazar configuration"

ansible/group_vars/all/kolla

@@ -114,6 +114,8 @@ overcloud_container_image_regex_map:
     enabled: "{{ kolla_enable_aodh | bool }}"
   - regex: barbican
     enabled: "{{ kolla_enable_barbican | bool }}"
+  - regex: blazar
+    enabled: "{{ kolla_enable_blazar | bool }}"
   - regex: ceilometer
     enabled: "{{ kolla_enable_ceilometer | bool }}"
   - regex: ceph
@@ -333,6 +335,7 @@ kolla_ansible_become: true
 
 kolla_enable_aodh: "no"
 kolla_enable_barbican: "no"
+kolla_enable_blazar: "no"
 kolla_enable_central_logging: "no"
 kolla_enable_ceph: "no"
 kolla_enable_ceilometer: "no"

ansible/kolla-openstack.yml

@@ -100,6 +100,7 @@
             mime: False
           register: stat_result
           with_items:
+            - { name: blazar, file: blazar.conf }
             - { name: ceph, file: ceph.conf }
             - { name: cinder, file: cinder.conf }
             - { name: designate, file: designate.conf }
@@ -205,6 +206,7 @@
         url: "http://{% raw %}{{ api_interface_address }}{% endraw %}:{{ inspector_store_port }}"
         token: fake-token
       # Extra free-form user-provided configuration.
+      kolla_extra_blazar: "{{ kolla_extra_config.blazar | default }}"
       kolla_extra_ceph: "{{ kolla_extra_config.ceph | default }}"
       kolla_extra_cinder: "{{ kolla_extra_config.cinder | default }}"
       kolla_extra_designate: "{{ kolla_extra_config.designate | default }}"

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

@@ -229,6 +229,7 @@ kolla_openstack_logging_debug:
 # OpenStack services can be enabled or disabled with these options
 #kolla_enable_aodh:
 #kolla_enable_barbican:
+#kolla_enable_blazar:
 #kolla_enable_ceilometer:
 #kolla_enable_central_logging:
 #kolla_enable_ceph:

ansible/roles/kolla-ansible/tests/test-extras.yml

@@ -105,6 +105,7 @@
             # Enable everything.
             kolla_enable_aodh: True
             kolla_enable_barbican: True
+            kolla_enable_blazar: True
             kolla_enable_ceilometer: True
             kolla_enable_central_logging: True
             kolla_enable_ceph: True
@@ -237,6 +238,7 @@
               # https://github.com/ansible/ansible/issues/19305.
               #enable_aodh: True
               #enable_barbican: True
+              #enable_blazar: True
               #enable_ceilometer: True
               #enable_central_logging: True
               #enable_ceph: True

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

@@ -11,6 +11,15 @@ kolla_node_custom_config_path: /etc/kolla/config
 # Whether to enable Barbican.
 kolla_enable_barbican:
 
+###############################################################################
+# Blazar configuration.
+
+# Whether to enable Blazar.
+kolla_enable_blazar:
+
+# Free form extra configuration to append to blazar.conf.
+kolla_extra_blazar:
+
 ###############################################################################
 # ceph configuration.
 

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

@@ -14,6 +14,10 @@ provisioner:
     group_vars:
       all:
         kolla_extra_config_path:
+        kolla_enable_blazar: true
+        kolla_extra_blazar: |
+          [extra-blazar.conf]
+          foo=bar
         kolla_enable_ceph: true
         kolla_extra_ceph: |
           [extra-ceph.conf]

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

@@ -13,6 +13,7 @@
     dest: "{{ kolla_node_custom_config_path }}/{{ item.dest }}"
     mode: 0640
   with_items:
+    - { src: blazar.conf.j2, dest: blazar.conf, enabled: "{{ kolla_enable_blazar }}" }
     - { src: ceph.conf.j2, dest: ceph.conf, enabled: "{{ kolla_enable_ceph }}" }
     - { src: cinder.conf.j2, dest: cinder.conf, enabled: "{{ kolla_enable_cinder }}" }
     - { src: designate.conf.j2, dest: designate.conf, enabled: "{{ kolla_enable_designate }}" }

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

@@ -0,0 +1,9 @@
+# {{ ansible_managed }}
+
+{% if kolla_extra_blazar %}
+#######################
+# Extra configuration
+#######################
+
+{{ kolla_extra_blazar }}
+{% endif %}

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

@@ -14,6 +14,11 @@ kolla_openstack_custom_config:
     dest: "{{ kolla_node_custom_config_path }}/barbican"
     patterns: "*"
     enabled: "{{ kolla_enable_barbican }}"
+  # Blazar.
+  - src: "{{ kolla_extra_config_path }}/blazar"
+    dest: "{{ kolla_node_custom_config_path }}/blazar"
+    patterns: "*"
+    enabled: "{{ kolla_enable_blazar }}"
   # Ceph.
   - src: "{{ kolla_extra_config_path }}/ceph"
     dest: "{{ kolla_node_custom_config_path }}/ceph"

doc/source/configuration/kolla-ansible.rst

@@ -150,6 +150,8 @@ which files are supported.
    File                            Purpose
    =============================== =======================================================
    ``barbican/*``                  Extended Barbican configuration.
+   ``blazar.conf``                 Blazar configuration.
+   ``blazar/*``                    Extended Blazar configuration.
    ``ceph.conf``                   Ceph configuration.
    ``ceph/*``                      Extended Ceph configuration.
    ``cinder.conf``                 Cinder configuration.

releasenotes/notes/add-support-for-custom-blazar-conf-c82ee78f2a92d693.yaml

@@ -0,0 +1,3 @@
+---
+features:
+  - Adds support for custom Blazar configuration.