Merge "Add support for custom CloudKitty configuration"

ansible/group_vars/all/kolla

@@ -122,6 +122,8 @@ overcloud_container_image_regex_map:
     enabled: "{{ kolla_enable_ceph | bool }}"
   - regex: cinder
     enabled: "{{ kolla_enable_cinder | bool }}"
+  - regex: cloudkitty
+    enabled: "{{ kolla_enable_cloudkitty | bool }}"
   - regex: collectd
     enabled: "{{ kolla_enable_collectd | bool }}"
   - regex: cron
@@ -345,6 +347,7 @@ kolla_enable_ceilometer: "no"
 # on the host. Setting this to true will disable NTP on the host.
 kolla_enable_chrony: "no"
 kolla_enable_cinder: "no"
+kolla_enable_cloudkitty: "no"
 kolla_enable_collectd: "no"
 kolla_enable_designate: "no"
 kolla_enable_elasticsearch: "{{ 'yes' if kolla_enable_central_logging | bool or kolla_enable_freezer | bool or kolla_enable_osprofiler | bool or kolla_enable_skydive | bool or kolla_enable_monasca | bool else 'no' }}"

ansible/kolla-openstack.yml

@@ -106,6 +106,7 @@
             - { name: ceilometer, file: ceilometer.conf }
             - { name: ceph, file: ceph.conf }
             - { name: cinder, file: cinder.conf }
+            - { name: cloudkitty, file: cloudkitty.conf }
             - { name: designate, file: designate.conf }
             - { name: glance, file: glance.conf }
             - { name: global, file: global.conf }
@@ -215,6 +216,7 @@
       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_cloudkitty: "{{ kolla_extra_config.cloudkitty | default }}"
       kolla_extra_designate: "{{ kolla_extra_config.designate | default }}"
       kolla_extra_glance: "{{ kolla_extra_config.glance | default }}"
       kolla_extra_global: "{{ kolla_extra_config.global | default }}"

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

@@ -53,6 +53,15 @@ kolla_enable_cinder:
 # Free form extra configuration to append to cinder.conf.
 kolla_extra_cinder:
 
+###############################################################################
+# CloudKitty configuration.
+
+# Whether to enable CloudKitty.
+kolla_enable_cloudkitty:
+
+# Free form extra configuration to append to cloudkitty.conf.
+kolla_extra_cloudkitty:
+
 ###############################################################################
 # designate configuration.
 

ansible/roles/kolla-openstack/molecule/default/tests/test_default.py

@@ -39,6 +39,7 @@ def test_service_config_directory(host, path):
     'path',
     ['ceph',
      'cinder',
+     'cloudkitty',
      'designate',
      'glance',
      'grafana',

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

@@ -30,6 +30,10 @@ provisioner:
         kolla_extra_cinder: |
           [extra-cinder.conf]
           foo=bar
+        kolla_enable_cloudkitty: true
+        kolla_extra_cloudkitty: |
+          [extra-cloudkitty.conf]
+          foo=bar
         kolla_enable_designate: true
         kolla_extra_designate: |
           [extra-designate.conf]

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

@@ -29,6 +29,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
     'path',
     ['ceph',
      'cinder',
+     'cloudkitty',
      'designate',
      'fluentd/filter',
      'fluentd/input',
@@ -62,6 +63,7 @@ def test_service_config_directory(host, path):
     'path',
     ['ceph.conf',
      'cinder.conf',
+     'cloudkitty.conf',
      'designate.conf',
      'galera.cnf',
      'glance.conf',

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

@@ -17,6 +17,7 @@
     - { 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: cloudkitty.conf.j2, dest: cloudkitty.conf, enabled: "{{ kolla_enable_cloudkitty }}" }
     - { src: designate.conf.j2, dest: designate.conf, enabled: "{{ kolla_enable_designate }}" }
     - { src: galera.cnf.j2, dest: galera.cnf, enabled: "{{ kolla_enable_mariadb }}" }
     - { src: glance.conf.j2, dest: glance.conf, enabled: "{{ kolla_enable_glance }}" }

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

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

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

@@ -34,6 +34,11 @@ kolla_openstack_custom_config:
     dest: "{{ kolla_node_custom_config_path }}/cinder"
     patterns: "*"
     enabled: "{{ kolla_enable_cinder }}"
+  # CloudKitty.
+  - src: "{{ kolla_extra_config_path }}/cloudkitty"
+    dest: "{{ kolla_node_custom_config_path }}/cloudkitty"
+    patterns: "*"
+    enabled: "{{ kolla_enable_cloudkitty }}"
   # Designate.
   - src: "{{ kolla_extra_config_path }}/designate"
     dest: "{{ kolla_node_custom_config_path }}/designate"

doc/source/configuration/kolla-ansible.rst

@@ -159,6 +159,8 @@ which files are supported.
    ``ceph/*``                      Extended Ceph configuration.
    ``cinder.conf``                 Cinder configuration.
    ``cinder/*``                    Extended Cinder configuration.
+   ``cloudkitty.conf``             CloudKitty configuration.
+   ``cloudkitty/*``                Extended CloudKitty configuration.
    ``designate.conf``              Designate configuration.
    ``designate/*``                 Extended Designate configuration.
    ``fluentd/filter``              Fluentd filter configuration.

releasenotes/notes/add-support-for-custom-cloudkitty-conf-af224caad9cd1ad4.yaml

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