Merge "ironic: Change Prometheus metrics dir"

Author: Zuul

ansible/roles/ironic/defaults/main.yml

@@ -244,7 +244,7 @@ ironic_conductor_default_volumes:
   - "kolla_logs:/var/log/kolla"
   - "ironic:/var/lib/ironic"
   - "{{ kolla_dev_repos_directory ~ '/ironic:/dev-mode/ironic' if ironic_dev_mode | bool else '' }}"
-  - "{{ 'ironic_prometheus_exporter_data:/var/lib/ironic/metrics' if enable_ironic_prometheus_exporter | bool else '' }}"
+  - "{{ 'ironic_prometheus_exporter_data:/var/lib/ironic-metrics' if enable_ironic_prometheus_exporter | bool else '' }}"
 ironic_tftp_default_volumes:
   - "{{ node_config_directory }}/ironic-tftp/:{{ container_config_directory }}/:ro"
   - "/etc/localtime:/etc/localtime:ro"
@@ -275,7 +275,7 @@ ironic_prometheus_exporter_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla"
-  - "ironic_prometheus_exporter_data:/var/lib/ironic/metrics"
+  - "ironic_prometheus_exporter_data:/var/lib/ironic-metrics"
 
 ironic_extra_volumes: "{{ default_extra_volumes }}"
 ironic_api_extra_volumes: "{{ ironic_extra_volumes }}"

ansible/roles/ironic/tasks/precheck.yml

@@ -14,6 +14,7 @@
       - ironic_api
       - ironic_inspector
       - ironic_http
+      - ironic_prometheus_exporter
   check_mode: false
   register: container_facts
 

ansible/roles/ironic/templates/ironic.conf.j2

@@ -34,7 +34,7 @@ driver = prometheus_exporter
 driver = noop
 {% endif %}
 {% if enable_ironic_prometheus_exporter | bool %}
-location = /var/lib/ironic/metrics
+location = /var/lib/ironic-metrics
 {% endif %}
 
 [oslo_messaging_rabbit]

tests/templates/globals-default.j2

@@ -118,6 +118,8 @@ enable_aodh: "yes"
 
 {% if scenario == "ironic" %}
 enable_ironic: "yes"
+enable_prometheus: "yes"
+enable_prometheus_openstack_exporter: "no"
 ironic_dnsmasq_dhcp_ranges:
   - range: "10.42.0.2,10.42.0.254,255.255.255.0"
 {% endif %}