Add support for custom Ceilometer configuration

Change-Id: I0a9e1a3b878231f9ce7bf295b5526c9cfabbbf9e
Story: 2005811
Task: 33551

ansible/kolla-openstack.yml

@@ -101,6 +101,7 @@
           register: stat_result
           with_items:
             - { name: blazar, file: blazar.conf }
+            - { name: ceilometer, file: ceilometer.conf }
             - { name: ceph, file: ceph.conf }
             - { name: cinder, file: cinder.conf }
             - { name: designate, file: designate.conf }
@@ -207,6 +208,7 @@
         token: fake-token
       # Extra free-form user-provided configuration.
       kolla_extra_blazar: "{{ kolla_extra_config.blazar | default }}"
+      kolla_extra_ceilometer: "{{ kolla_extra_config.ceilometer | 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-openstack/defaults/main.yml

@@ -20,6 +20,15 @@ kolla_enable_blazar:
 # Free form extra configuration to append to blazar.conf.
 kolla_extra_blazar:
 
+###############################################################################
+# Ceilometer configuration.
+
+# Whether to enable Ceilometer.
+kolla_enable_ceilometer:
+
+# Free form extra configuration to append to ceilometer.conf.
+kolla_extra_ceilometer:
+
 ###############################################################################
 # ceph configuration.
 

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

@@ -18,6 +18,10 @@ provisioner:
         kolla_extra_blazar: |
           [extra-blazar.conf]
           foo=bar
+        kolla_enable_ceilometer: true
+        kolla_extra_ceilometer: |
+          [extra-ceilometer.conf]
+          foo=bar
         kolla_enable_ceph: true
         kolla_extra_ceph: |
           [extra-ceph.conf]

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

@@ -14,6 +14,7 @@
     mode: 0640
   with_items:
     - { src: blazar.conf.j2, dest: blazar.conf, enabled: "{{ kolla_enable_blazar }}" }
+    - { src: ceilometer.conf.j2, dest: ceilometer.conf, enabled: "{{ kolla_enable_ceilometer }}" }
     - { 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/ceilometer.conf.j2

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

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

@@ -19,6 +19,11 @@ kolla_openstack_custom_config:
     dest: "{{ kolla_node_custom_config_path }}/blazar"
     patterns: "*"
     enabled: "{{ kolla_enable_blazar }}"
+  # Ceilometer.
+  - src: "{{ kolla_extra_config_path }}/ceilometer"
+    dest: "{{ kolla_node_custom_config_path }}/ceilometer"
+    patterns: "*"
+    enabled: "{{ kolla_enable_ceilometer }}"
   # Ceph.
   - src: "{{ kolla_extra_config_path }}/ceph"
     dest: "{{ kolla_node_custom_config_path }}/ceph"

doc/source/configuration/kolla-ansible.rst

@@ -153,6 +153,8 @@ which files are supported.
    ``barbican/*``                  Extended Barbican configuration.
    ``blazar.conf``                 Blazar configuration.
    ``blazar/*``                    Extended Blazar configuration.
+   ``ceilometer.conf``             Ceilometer configuration.
+   ``ceilometer/*``                Extended Ceilometer configuration.
    ``ceph.conf``                   Ceph configuration.
    ``ceph/*``                      Extended Ceph configuration.
    ``cinder.conf``                 Cinder configuration.

releasenotes/notes/add-support-for-custom-ceilometer-conf-66d907cf3c7ec29b.yaml

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