Merge "Support customising Prometheus config"

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

@@ -261,6 +261,7 @@ kolla_openstack_logging_debug:
 #kolla_enable_neutron_qos:
 #kolla_enable_neutron_agent_ha:
 #kolla_enable_neutron_vpnaas:
+#kolla_enable_prometheus:
 #kolla_enable_rally:
 #kolla_enable_sahara:
 #kolla_enable_senlin:

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

@@ -100,6 +100,7 @@
               - enable_monasca
               - enable_neutron
               - enable_nova
+              - enable_prometheus
               - enable_storm
               - enable_zookeeper
               - grafana_admin_username

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

@@ -156,6 +156,7 @@
             kolla_enable_octavia: True
             kolla_enable_osprofiler: True
             kolla_enable_panko: True
+            kolla_enable_prometheus: True
             kolla_enable_rally: True
             kolla_enable_searchlight: True
             kolla_enable_sahara: True
@@ -289,6 +290,7 @@
               #enable_octavia: True
               #enable_osprofiler: True
               #enable_panko: True
+              #enable_prometheus: True
               #enable_rally: True
               #enable_sahara: True
               #enable_searchlight: True

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

@@ -401,6 +401,12 @@ kolla_extra_nova:
 # Whether to enable Octavia.
 kolla_enable_octavia:
 
+###############################################################################
+# Prometheus configuration.
+
+# Whether to enable Prometheus.
+kolla_enable_prometheus:
+
 ###############################################################################
 # Sahara configuration.
 

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

@@ -54,6 +54,7 @@ def test_service_config_directory(host, path):
      'murano',
      'neutron',
      'nova',
+     'prometheus',
      'sahara',
      'storm',
      'swift',

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

@@ -98,6 +98,7 @@ provisioner:
         kolla_extra_octavia: |
           [extra-octavia.conf]
           foo=bar
+        kolla_enable_prometheus: true
         kolla_enable_sahara: true
         kolla_extra_sahara: |
           [extra-sahara.conf]

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

@@ -48,6 +48,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
      'neutron',
      'nova',
      'octavia',
+     'prometheus',
      'sahara',
      'storm',
      'swift',

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

@@ -158,6 +158,11 @@ kolla_openstack_custom_config:
     dest: "{{ kolla_node_custom_config_path }}/octavia"
     patterns: "*"
     enabled: "{{ kolla_enable_octavia }}"
+  # Prometheus config
+  - src: "{{ kolla_extra_config_path }}/prometheus"
+    dest: "{{ kolla_node_custom_config_path }}/prometheus"
+    patterns: "*"
+    enabled: "{{ kolla_enable_prometheus }}"
   # Sahara.
   - src: "{{ kolla_extra_config_path }}/sahara"
     dest: "{{ kolla_node_custom_config_path }}/sahara"

etc/kayobe/kolla.yml

@@ -222,6 +222,7 @@
 #kolla_enable_octavia:
 #kolla_enable_osprofiler:
 #kolla_enable_panko:
+#kolla_enable_prometheus:
 #kolla_enable_qdrouterd:
 #kolla_enable_rally:
 #kolla_enable_sahara: