Merge "ironic: Add uWSGI support for prometheus-exporter"

Author: Zuul

ansible/roles/ironic/defaults/main.yml

@@ -262,6 +262,7 @@ ironic_logging_debug: "{{ openstack_logging_debug }}"
 openstack_ironic_auth: "{{ openstack_auth }}"
 
 ironic_api_workers: "{{ openstack_service_workers }}"
+ironic_prometheus_exporter_workers: "{{ openstack_service_workers }}"
 
 #########
 # Ironic

ansible/roles/ironic/tasks/config.yml

@@ -165,7 +165,9 @@
     - "{{ node_config_directory }}/ironic/{{ inventory_hostname }}/ironic-prometheus-exporter-wsgi.conf"
     - "{{ node_config_directory }}/ironic/ironic-prometheus-exporter-wsgi.conf"
     - "ironic-prometheus-exporter-wsgi.conf.j2"
-  when: service | service_enabled_and_mapped_to_host
+  when:
+    - service | service_enabled_and_mapped_to_host
+    - ironic_wsgi_provider == "apache"
 
 - name: Copying over existing Ironic policy file
   vars:
@@ -199,16 +201,19 @@
     name: service-uwsgi-config
   vars:
     project_services: "{{ ironic_services }}"
-    service: "{{ ironic_services['ironic-api'] }}"
-    service_name: "ironic-api"
-    service_uwsgi_config_http_port: "{{ ironic_api_listen_port }}"
+    service: "{{ ironic_services[item.name] }}"
+    service_name: "{{ item.name }}"
+    service_uwsgi_config_http_port: "{{ item.port }}"
     service_uwsgi_config_log_file_chmod: "644"
     service_uwsgi_config_module: "{{ service.wsgi }}"
     service_uwsgi_config_tls_backend: "{{ ironic_enable_tls_backend | bool }}"
     service_uwsgi_config_tls_cert: "/etc/ironic/certs/ironic-cert.pem"
     service_uwsgi_config_tls_key: "/etc/ironic/certs/ironic-key.pem"
     service_uwsgi_config_uid: "ironic"
-    service_uwsgi_config_workers: "{{ ironic_api_workers }}"
+    service_uwsgi_config_workers: "{{ item.workers }}"
   when:
     - service | service_enabled_and_mapped_to_host
     - ironic_wsgi_provider == "uwsgi"
+  loop:
+    - { name: "ironic-api", port: "{{ ironic_api_listen_port }}", workers: "{{ ironic_api_workers }}" }
+    - { name: "ironic-prometheus-exporter", port: "{{ ironic_prometheus_exporter_port }}", workers: "{{ ironic_prometheus_exporter_workers }}" }

ansible/roles/ironic/templates/ironic-prometheus-exporter.json.j2

@@ -1,20 +1,27 @@
 {% set ironic_prometheus_exporter_cmd = 'apache2' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd' %}
 {% set ironic_prometheus_exporter_dir = 'apache2/conf-enabled' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd/conf.d' %}
+{% set command = ('/usr/sbin/' + apache_binary + ' -DFOREGROUND') if ironic_wsgi_provider == 'apache' else 'uwsgi /etc/ironic/ironic-prometheus-exporter-uwsgi.ini' %}
 {
-    "command": "/usr/sbin/{{ ironic_prometheus_exporter_cmd }} -DFOREGROUND",
+    "command": "{{ command }}",
     "config_files": [
+        {
+            "source": "{{ container_config_directory }}/ironic.conf",
+            "dest": "/etc/ironic/ironic.conf",
+            "owner": "ironic",
+            "perm": "0600"
+        }{% if ironic_wsgi_provider == 'apache' %},
         {
             "source": "{{ container_config_directory }}/ironic-prometheus-exporter-wsgi.conf",
             "dest": "/etc/{{ ironic_prometheus_exporter_dir }}/ironic-prometheus-exporter-wsgi.conf",
             "owner": "ironic",
             "perm": "0600"
-        },
+        }{% elif ironic_wsgi_provider == 'uwsgi' %},
         {
-            "source": "{{ container_config_directory }}/ironic.conf",
-            "dest": "/etc/ironic/ironic.conf",
+            "source": "{{ container_config_directory }}/ironic-prometheus-exporter-uwsgi.ini",
+            "dest": "/etc/ironic/ironic-prometheus-exporter-uwsgi.ini",
             "owner": "ironic",
             "perm": "0600"
-        }{% if kolla_copy_ca_into_containers | bool %},
+        }{% endif %}{% if kolla_copy_ca_into_containers | bool %},
         {
             "source": "{{ container_config_directory }}/ca-certificates",
             "dest": "/var/lib/kolla/share/ca-certificates",