Synchronise master with upstream

ansible/inventory/all-in-one

@@ -270,12 +270,26 @@ network
 cinder
 
 [cinder-backup:children]
+cinder
+
+[cinder-backup-lvm:children]
+storage
+
+[cinder-backup-multiple:children]
+cinder
 storage
 
 [cinder-scheduler:children]
 cinder
 
 [cinder-volume:children]
+cinder
+
+[cinder-volume-lvm:children]
+storage
+
+[cinder-volume-multiple:children]
+cinder
 storage
 
 # Cloudkitty
@@ -286,11 +300,12 @@ cloudkitty
 cloudkitty
 
 # iSCSI
+# NOTE(mnasiadka): We need iscsid on cinder-volume hosts and clients
 [iscsid:children]
 compute
 storage
-ironic
 
+# NOTE(mnasiadka): We need tgtd on storage nodes for Cinder LVM
 [tgtd:children]
 storage
 

ansible/inventory/multinode

@@ -288,12 +288,26 @@ neutron
 cinder
 
 [cinder-backup:children]
+cinder
+
+[cinder-backup-lvm:children]
+storage
+
+[cinder-backup-multiple:children]
+cinder
 storage
 
 [cinder-scheduler:children]
 cinder
 
 [cinder-volume:children]
+cinder
+
+[cinder-volume-lvm:children]
+storage
+
+[cinder-volume-multiple:children]
+cinder
 storage
 
 # Cloudkitty

ansible/releasenotes/notes/drop-apache-wsgi-provider-5049b660249d0f20.yaml

@@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    Support for running WSGI services under Apache+mod_wsgi has been dropped.
+    All API services now run exclusively under uWSGI. The ``*_wsgi_provider``
+    variables (``keystone_wsgi_provider``, ``nova_wsgi_provider``,
+    ``cinder_wsgi_provider``, etc.) have been removed. If you had any of these
+    set to ``apache`` in your configuration, remove them before upgrading.

ansible/roles/aodh/defaults/main.yml

@@ -260,8 +260,3 @@ aodh_database_enable_tls_internal: "{{ database_enable_tls_internal | bool }}"
 # Copy certificates
 ###################
 aodh_copy_certs: "{{ kolla_copy_ca_into_containers | bool or aodh_database_enable_tls_internal | bool }}"
-
-####################
-# WSGI
-####################
-aodh_wsgi_provider: "uwsgi"

ansible/roles/aodh/tasks/config.yml

@@ -78,17 +78,4 @@
     service_uwsgi_config_uid: "aodh"
     service_uwsgi_config_workers: "{{ aodh_api_workers }}"
   when:
-    - aodh_wsgi_provider == "uwsgi"
-    - service | service_enabled_and_mapped_to_host
-
-- name: Copying over wsgi-aodh files for services
-  vars:
-    service: "{{ aodh_services['aodh-api'] }}"
-  ansible.builtin.template:
-    src: "wsgi-aodh.conf.j2"
-    dest: "{{ node_config_directory }}/aodh-api/wsgi-aodh.conf"
-    mode: "0660"
-  become: true
-  when:
-    - aodh_wsgi_provider == "apache"
     - service | service_enabled_and_mapped_to_host

ansible/roles/aodh/templates/aodh-api.json.j2

@@ -1,27 +1,18 @@
-{% set apache_binary = 'apache2' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd' %}
-{% set aodh_dir = 'apache2/conf-enabled' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd/conf.d' %}
-{% set command = ('/usr/sbin/' + apache_binary + ' -DFOREGROUND') if aodh_wsgi_provider == 'apache' else 'uwsgi /etc/aodh/aodh-api-uwsgi.ini' %}
 {
-    "command": "{{ command }}",
+    "command": "uwsgi /etc/aodh/aodh-api-uwsgi.ini",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/aodh.conf",
             "dest": "/etc/aodh/aodh.conf",
             "owner": "aodh",
             "perm": "0600"
-        }{% if aodh_wsgi_provider == "apache" %},
-        {
-            "source": "{{ container_config_directory }}/wsgi-aodh.conf",
-            "dest": "/etc/{{ aodh_dir }}/wsgi-aodh.conf",
-            "owner": "root",
-            "perm": "0600"
-        }{% elif aodh_wsgi_provider == 'uwsgi' %},
+        },
         {
             "source": "{{ container_config_directory }}/aodh-api-uwsgi.ini",
             "dest": "/etc/aodh/aodh-api-uwsgi.ini",
             "owner": "aodh",
             "perm": "0600"
-        }{% endif %}{% if aodh_policy_file is defined %},
+        }{% if aodh_policy_file is defined %},
         {
             "source": "{{ container_config_directory }}/{{ aodh_policy_file }}",
             "dest": "/etc/aodh/{{ aodh_policy_file }}",

ansible/roles/barbican/defaults/main.yml

@@ -236,8 +236,3 @@ barbican_database_enable_tls_internal: "{{ database_enable_tls_internal | bool }
 # Copy certificates
 ###################
 barbican_copy_certs: "{{ kolla_copy_ca_into_containers | bool or barbican_enable_tls_backend | bool or barbican_database_enable_tls_internal | bool }}"
-
-###################
-# WSGI
-###################
-barbican_wsgi_provider: "uwsgi"

ansible/roles/barbican/tasks/config.yml

@@ -50,7 +50,6 @@
     service_uwsgi_config_workers: "{{ barbican_api_workers }}"
   when:
     - service | service_enabled_and_mapped_to_host
-    - barbican_wsgi_provider == "uwsgi"
 
 - name: Copying over config.json files for services
   ansible.builtin.template:

ansible/roles/cinder/defaults/main.yml

@@ -41,7 +41,10 @@ cinder_services:
     healthcheck: "{{ cinder_scheduler_healthcheck }}"
   cinder-volume:
     container_name: cinder_volume
-    group: cinder-volume
+    group: >-
+      {{ 'cinder-volume-multiple' if (cinder_enabled_backends | length > 1 and enable_cinder_backend_lvm | bool) else
+         'cinder-volume-lvm' if enable_cinder_backend_lvm | bool else
+         'cinder-volume' }}
     enabled: true
     image: "{{ cinder_volume_image_full }}"
     privileged: true
@@ -52,7 +55,10 @@ cinder_services:
     healthcheck: "{{ cinder_volume_healthcheck }}"
   cinder-backup:
     container_name: cinder_backup
-    group: cinder-backup
+    group: >-
+      {{ 'cinder-backup-multiple' if (cinder_enabled_backends | length > 1 and enable_cinder_backend_lvm | bool) else
+         'cinder-backup-lvm' if enable_cinder_backend_lvm | bool else
+         'cinder-backup' }}
     enabled: "{{ enable_cinder_backup | bool }}"
     image: "{{ cinder_backup_image_full }}"
     privileged: true
@@ -382,11 +388,6 @@ cinder_enable_tls_backend: "{{ kolla_enable_tls_backend }}"
 cinder_cluster_name: ""
 cinder_cluster_skip_precheck: false
 
-############
-# WSGI
-############
-cinder_wsgi_provider: "uwsgi"
-
 # Database
 cinder_database_enable_tls_internal: "{{ database_enable_tls_internal | bool }}"
 

ansible/roles/cinder/tasks/config.yml

@@ -54,22 +54,6 @@
   become: true
   with_dict: "{{ cinder_services | select_services_enabled_and_mapped_to_host }}"
 
-- name: Copying over cinder-wsgi.conf
-  vars:
-    service: "{{ cinder_services['cinder-api'] }}"
-  become: true
-  ansible.builtin.template:
-    src: "{{ item }}"
-    dest: "{{ node_config_directory }}/cinder-api/cinder-wsgi.conf"
-    mode: "0660"
-  with_first_found:
-    - "{{ node_custom_config }}/cinder/{{ inventory_hostname }}/cinder-wsgi.conf"
-    - "{{ node_custom_config }}/cinder/cinder-wsgi.conf"
-    - "cinder-wsgi.conf.j2"
-  when:
-    - service | service_enabled_and_mapped_to_host
-    - cinder_wsgi_provider == "apache"
-
 - name: "Configure uWSGI for Cinder"
   ansible.builtin.include_role:
     name: service-uwsgi-config
@@ -87,7 +71,6 @@
     service_uwsgi_config_workers: "{{ cinder_api_workers }}"
   when:
     - service | service_enabled_and_mapped_to_host
-    - cinder_wsgi_provider == "uwsgi"
 
 - name: Copying over cinder.conf
   vars:

ansible/roles/cinder/tasks/precheck.yml

@@ -54,7 +54,7 @@
   when:
     - enable_cinder | bool
     - enable_cinder_backend_lvm | bool
-    - inventory_hostname in groups['cinder-volume']
+    - inventory_hostname in groups['cinder-volume-multiple'] if cinder_enabled_backends | length > 1 else inventory_hostname in groups['cinder-volume-lvm']
 
 - name: Checking for coordination backend if Ceph backend is enabled
   run_once: true
@@ -64,7 +64,7 @@
     - not skip_cinder_backend_check | bool
     - cinder_backend_ceph | bool
     - cinder_coordination_backend == ''
-    - groups['cinder-volume'] | length > 1
+    - groups['cinder-volume-multiple'] | length > 1 if enable_cinder_backend_lvm | bool else groups['cinder-volume'] | length > 1
 
 - name: Check if S3 configurations are defined
   ansible.builtin.assert:

ansible/roles/cinder/templates/cinder-api.json.j2

@@ -1,27 +1,18 @@
-{% set cinder_cmd = 'apache2' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd' %}
-{% set cinder_dir = 'apache2/conf-enabled' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd/conf.d' %}
-{% set command = '/usr/sbin/' + apache_binary + ' -DFOREGROUND' if cinder_wsgi_provider == 'apache' else 'uwsgi /etc/cinder/cinder-api-uwsgi.ini' %}
 {
-    "command": "{{ command }}",
+    "command": "uwsgi /etc/cinder/cinder-api-uwsgi.ini",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/cinder.conf",
             "dest": "/etc/cinder/cinder.conf",
             "owner": "cinder",
             "perm": "0600"
-        }{% if cinder_wsgi_provider == 'apache' %},
-        {
-            "source": "{{ container_config_directory }}/cinder-wsgi.conf",
-            "dest": "/etc/{{ cinder_dir }}/cinder-wsgi.conf",
-            "owner": "cinder",
-            "perm": "0600"
-        }{% elif cinder_wsgi_provider == 'uwsgi' %},
+        },
         {
             "source": "{{ container_config_directory }}/cinder-api-uwsgi.ini",
             "dest": "/etc/cinder/cinder-api-uwsgi.ini",
             "owner": "cinder",
             "perm": "0600"
-        }{% endif %}{% if cinder_policy_file is defined %},
+        }{% if cinder_policy_file is defined %},
         {
             "source": "{{ container_config_directory }}/{{ cinder_policy_file }}",
             "dest": "/etc/cinder/{{ cinder_policy_file }}",

ansible/roles/cloudkitty/defaults/main.yml

@@ -235,8 +235,3 @@ cloudkitty_database_enable_tls_internal: "{{ database_enable_tls_internal | bool
 # Copy certificates
 ###################
 cloudkitty_copy_certs: "{{ kolla_copy_ca_into_containers | bool or cloudkitty_database_enable_tls_internal | bool }}"
-
-#######
-# WSGI
-#######
-cloudkitty_wsgi_provider: "uwsgi"

ansible/roles/cloudkitty/tasks/config.yml

@@ -90,19 +90,6 @@
     service_uwsgi_config_workers: "{{ cloudkitty_api_workers }}"
   when:
     - service | service_enabled_and_mapped_to_host
-    - cloudkitty_wsgi_provider == "uwsgi"
-
-- name: Copying over wsgi-cloudkitty.conf
-  vars:
-    service: "{{ cloudkitty_services['cloudkitty-api'] }}"
-  ansible.builtin.template:
-    src: "wsgi-cloudkitty.conf.j2"
-    dest: "{{ node_config_directory }}/cloudkitty-api/wsgi-cloudkitty.conf"
-    mode: "0660"
-  become: true
-  when:
-    - cloudkitty_wsgi_provider == "apache"
-    - service | service_enabled_and_mapped_to_host
 
 - name: Copying over existing policy file
   ansible.builtin.template: