Merge pull request #694 from stackhpc/upstream/master-2025-03-31

Synchronise master with upstream

Author: priteau

README.rst

@@ -62,7 +62,6 @@ Kolla Ansible deploys containers for the following OpenStack projects:
 - `Nova <https://docs.openstack.org/nova/latest/>`__
 - `Octavia <https://docs.openstack.org/octavia/latest/>`__
 - Skyline (`APIServer <https://docs.openstack.org/skyline-apiserver/latest/>`__ and `Console <https://docs.openstack.org/skyline-console/latest/>`__)
-- `Swift <https://docs.openstack.org/swift/latest/>`__
 - `Tacker <https://docs.openstack.org/tacker/latest/>`__
 - `Trove <https://docs.openstack.org/trove/latest/>`__
 - `Venus <https://docs.openstack.org/venus/latest/>`__

ansible/group_vars/all.yml

@@ -277,7 +277,12 @@ om_rabbitmq_cacert: "{{ rabbitmq_cacert }}"
 om_enable_rabbitmq_high_availability: false
 # Only enable quorum queues if you disable om_enable_rabbitmq_high_availability
 om_enable_rabbitmq_quorum_queues: true
-om_enable_queue_manager: false
+om_enable_queue_manager: true
+# Enabling om_enable_rabbitmq_transient_quorum_queue will have no effect
+# without also enabling om_enable_rabbitmq_quorum_queues.
+# om_enable_rabbitmq_transient_quorum_queue should only be used in conunction
+# with om_enable_queue_manager.
+om_enable_rabbitmq_transient_quorum_queue: "{{ om_enable_rabbitmq_quorum_queues | bool and om_enable_queue_manager | bool }}"
 
 ####################
 # Networking options
@@ -286,8 +291,6 @@ network_interface: "eth0"
 neutron_external_interface: "eth1"
 kolla_external_vip_interface: "{{ network_interface }}"
 api_interface: "{{ network_interface }}"
-swift_storage_interface: "{{ network_interface }}"
-swift_replication_interface: "{{ swift_storage_interface }}"
 migration_interface: "{{ api_interface }}"
 tunnel_interface: "{{ network_interface }}"
 octavia_network_interface: "{{ 'o-hm0' if octavia_network_type == 'tenant' else api_interface }}"
@@ -302,8 +305,6 @@ ironic_tftp_interface: "{{ api_interface }}"
 network_address_family: "ipv4"
 api_address_family: "{{ network_address_family }}"
 storage_address_family: "{{ network_address_family }}"
-swift_storage_address_family: "{{ storage_address_family }}"
-swift_replication_address_family: "{{ swift_storage_address_family }}"
 migration_address_family: "{{ api_address_family }}"
 tunnel_address_family: "{{ network_address_family }}"
 octavia_network_address_family: "{{ api_address_family }}"
@@ -711,17 +712,6 @@ skyline_console_listen_port: "{{ skyline_console_port }}"
 skyline_console_public_port: "{{ haproxy_single_external_frontend_public_port if haproxy_single_external_frontend | bool else skyline_console_port }}"
 skyline_enable_sso: "{{ enable_keystone_federation | bool and keystone_identity_providers | selectattr('protocol', 'equalto', 'openid') | list | count > 0 }}"
 
-swift_internal_fqdn: "{{ kolla_internal_fqdn }}"
-swift_external_fqdn: "{{ kolla_external_fqdn }}"
-swift_internal_base_endpoint: "{{ swift_internal_fqdn | kolla_url(internal_protocol, swift_proxy_server_port) }}"
-swift_public_base_endpoint: "{{ swift_external_fqdn | kolla_url(public_protocol, swift_proxy_server_port) }}"
-swift_proxy_server_port: "8080"
-swift_proxy_server_listen_port: "{{ swift_proxy_server_port }}"
-swift_object_server_port: "6000"
-swift_account_server_port: "6001"
-swift_container_server_port: "6002"
-swift_rsync_port: "10873"
-
 syslog_udp_port: "{{ fluentd_syslog_port }}"
 
 tacker_internal_fqdn: "{{ kolla_internal_fqdn }}"
@@ -862,6 +852,7 @@ enable_cinder_backend_pure_iscsi: "no"
 enable_cinder_backend_pure_fc: "no"
 enable_cinder_backend_pure_roce: "no"
 enable_cinder_backend_pure_nvme_tcp: "no"
+enable_cinder_backend_lightbits: "no"
 enable_cloudkitty: "no"
 enable_collectd: "no"
 enable_cyborg: "no"
@@ -947,9 +938,6 @@ enable_prometheus: "no"
 enable_proxysql: "yes"
 enable_redis: "no"
 enable_skyline: "no"
-enable_swift: "no"
-enable_swift_s3api: "no"
-enable_swift_recon: "no"
 enable_tacker: "no"
 enable_telegraf: "no"
 enable_trove: "no"
@@ -1106,12 +1094,11 @@ openstack_auth:
 #######################
 # Glance options
 #######################
-glance_backend_file: "{{ not (glance_backend_ceph | bool or glance_backend_s3 | bool or glance_backend_swift | bool or glance_backend_vmware | bool) }}"
+glance_backend_file: "{{ not (glance_backend_ceph | bool or glance_backend_s3 | bool or glance_backend_vmware | bool) }}"
 glance_backend_ceph: "no"
 glance_backend_vmware: "no"
 glance_backend_s3: "no"
 enable_glance_image_cache: "no"
-glance_backend_swift: "{{ enable_swift | bool }}"
 glance_file_datadir_volume: "glance"
 glance_enable_rolling_upgrade: "no"
 glance_enable_property_protection: "no"
@@ -1130,8 +1117,8 @@ barbican_library_path: "/usr/lib/libCryptoki2_64.so"
 #################
 # Gnocchi options
 #################
-# Valid options are [ file, ceph, swift ]
-gnocchi_backend_storage: "{% if enable_swift | bool %}swift{% else %}file{% endif %}"
+# Valid options are [ file, ceph ]
+gnocchi_backend_storage: "file"
 
 # Valid options are [redis, '']
 gnocchi_incoming_storage: "{{ 'redis' if enable_redis | bool else '' }}"
@@ -1150,7 +1137,7 @@ cinder_target_helper: "{{ 'lioadm' if ansible_facts.os_family == 'RedHat' else '
 # Valid options are [ '', redis, etcd ]
 cinder_coordination_backend: "{{ 'redis' if enable_redis | bool else 'etcd' if enable_etcd | bool else '' }}"
 
-# Valid options are [ nfs, swift, ceph, s3 ]
+# Valid options are [ nfs, ceph, s3 ]
 cinder_backup_driver: "ceph"
 cinder_backup_share: ""
 cinder_backup_mount_options_nfs: ""

ansible/inventory/all-in-one

@@ -94,9 +94,6 @@ control
 [horizon:children]
 control
 
-[swift:children]
-control
-
 [barbican:children]
 control
 
@@ -306,19 +303,6 @@ network
 [manila-data:children]
 manila
 
-# Swift
-[swift-proxy-server:children]
-swift
-
-[swift-account-server:children]
-storage
-
-[swift-container-server:children]
-storage
-
-[swift-object-server:children]
-storage
-
 # Barbican
 [barbican-api:children]
 barbican

ansible/inventory/multinode

@@ -118,9 +118,6 @@ control
 [horizon:children]
 control
 
-[swift:children]
-control
-
 [barbican:children]
 control
 
@@ -325,19 +322,6 @@ network
 [manila-data:children]
 manila
 
-# Swift
-[swift-proxy-server:children]
-swift
-
-[swift-account-server:children]
-storage
-
-[swift-container-server:children]
-storage
-
-[swift-object-server:children]
-storage
-
 # Barbican
 [barbican-api:children]
 barbican

ansible/library/kolla_container_facts.py

@@ -46,7 +46,7 @@
       - The action to perform
     required: True
     type: str
-author: Jeffrey Zhang, Michal Nasiadka
+author: Jeffrey Zhang, Michal Nasiadka, Ivan Halomi
 '''
 
 EXAMPLES = '''
@@ -89,6 +89,11 @@
       kolla_container_facts:
         container_engine: docker
         action: get_volumes
+
+    - name: Get container names
+      kolla_container_facts:
+        container_engine: docker
+        action: get_containers_names
 '''
 
 
@@ -122,6 +127,12 @@ def _remap_envs(self, envs_raw: list) -> dict:
             envs[key] = value
         return envs
 
+    def get_containers_names(self):
+        """Handles when module is called with action get_containers_names"""
+        containers = self.client.containers.list()
+        names = [cont.name for cont in containers]
+        self.result['container_names'] = names
+
     def get_containers(self):
         """Handle when module is called with action get_containers"""
         names = self.params.get('name')
@@ -140,8 +151,8 @@ def get_containers(self):
 
     def get_containers_state(self):
         """Handle when module is called with action get_containers_state"""
-        # NOTE(r-krcek): This function can be removed when bifrost and swift
-        # roles switch to modern format
+        # NOTE(r-krcek): This function can be removed when bifrost
+        # role switches to modern format
         names = self.params.get('name')
         self.result['states'] = dict()
 
@@ -152,8 +163,8 @@ def get_containers_state(self):
 
     def get_containers_env(self):
         """Handle when module is called with action get_containers_state"""
-        # NOTE(r-krcek): This function can be removed when bifrost and swift
-        # roles switch to modern format
+        # NOTE(r-krcek): This function can be removed when bifrost
+        # role switches to modern format
         names = self.params.get('name')
         self.result['envs'] = dict()
 
@@ -216,6 +227,7 @@ def main():
                     choices=['get_containers',
                              'get_containers_env',
                              'get_containers_state',
+                             'get_containers_names',
                              'get_volumes']),
     )
 

ansible/roles/aodh/templates/aodh.conf.j2

@@ -61,6 +61,12 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% if service_name == 'aodh-api' %}
+processname = {{ service_name }}
+{% endif %}
+{% endif %}
 heartbeat_in_pthread = {{ service_name == 'aodh-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
@@ -71,6 +77,9 @@ amqp_durable_queues = true
 {% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
+{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
+rabbit_transient_quorum_queue = true
+{% endif %}
 {% endif %}
 
 [oslo_concurrency]

ansible/roles/barbican/templates/barbican.conf.j2

@@ -84,6 +84,9 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
@@ -94,6 +97,9 @@ amqp_durable_queues = true
 {% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
+{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
+rabbit_transient_quorum_queue = true
+{% endif %}
 {% endif %}
 
 [oslo_middleware]

ansible/roles/blazar/templates/blazar.conf.j2

@@ -55,6 +55,9 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
@@ -65,6 +68,9 @@ amqp_durable_queues = true
 {% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
+{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
+rabbit_transient_quorum_queue = true
+{% endif %}
 {% endif %}
 
 {% if blazar_policy_file is defined %}

ansible/roles/ceilometer/tasks/register.yml

@@ -4,19 +4,3 @@
   vars:
     service_ks_register_auth: "{{ openstack_ceilometer_auth }}"
     service_ks_register_users: "{{ ceilometer_ks_users }}"
-
-- name: Associate the ResellerAdmin role and ceilometer user
-  become: true
-  kolla_toolbox:
-    container_engine: "{{ kolla_container_engine }}"
-    module_name: openstack.cloud.role_assignment
-    module_args:
-      project: "service"
-      user: "{{ ceilometer_keystone_user }}"
-      role: "ResellerAdmin"
-      region_name: "{{ openstack_region_name }}"
-      auth: "{{ openstack_ceilometer_auth }}"
-      endpoint_type: "{{ openstack_interface }}"
-      cacert: "{{ openstack_cacert }}"
-  when: enable_swift | bool
-  run_once: True

ansible/roles/ceilometer/templates/ceilometer.conf.j2

@@ -36,6 +36,9 @@ ca_file = /etc/ceilometer/vmware_ca
 transport_url = {{ notify_transport_url }}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true
@@ -46,6 +49,9 @@ amqp_durable_queues = true
 {% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
+{% if om_enable_rabbitmq_transient_quorum_queue | bool %}
+rabbit_transient_quorum_queue = true
+{% endif %}
 {% endif %}
 
 {% if ceilometer_policy_file is defined %}