Merge pull request #570 from stackhpc/upstream/2023.1-2024-06-24

Synchronise 2023.1 with upstream

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

@@ -11,6 +11,7 @@ os_admin_username = {{ blazar_keystone_user }}
 os_admin_password = {{ blazar_keystone_password }}
 os_admin_project_name = service
 identity_service = identity
+cafile = {{ openstack_cacert }}
 
 [api]
 api_v2_controllers = oshosts,leases

ansible/roles/cinder/templates/cinder.conf.j2

@@ -43,6 +43,7 @@ backup_file_size = 327680000
 {% elif enable_swift | bool and cinder_backup_driver == "swift" %}
 backup_driver = cinder.backup.drivers.swift.SwiftBackupDriver
 backup_swift_url = {{ swift_internal_base_endpoint }}/v1/AUTH_
+backup_swift_ca_cert_file = {{ openstack_cacert }}
 backup_swift_auth = per_user
 backup_swift_auth_version = 1
 backup_swift_user =

ansible/roles/mariadb/defaults/main.yml

@@ -120,10 +120,6 @@ mariadb_wsrep_extra_provider_options: []
 ####################
 # Backups
 ####################
-mariabackup_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/mariadb-server"
-mariabackup_tag: "{{ mariadb_tag }}"
-mariabackup_image_full: "{{ mariabackup_image }}:{{ mariabackup_tag }}"
-
 mariadb_backup_host: "{{ groups[mariadb_shard_group][0] }}"
 mariadb_backup_database_schema: "PERCONA_SCHEMA"
 mariadb_backup_database_user: "{% if mariadb_loadbalancer == 'haproxy' %}backup{% else %}{{ mariadb_shard_backup_user_prefix }}{{ mariadb_shard_id | string }}{% endif %}"

ansible/roles/mariadb/tasks/backup.yml

@@ -1,12 +1,24 @@
 ---
+- name: Get MariaDB container facts
+  become: true
+  kolla_container_facts:
+    container_engine: "{{ kolla_container_engine }}"
+    name:
+      - "{{ mariadb_services.mariadb.container_name }}"
+  check_mode: false
+  register: container_facts
+
 - name: Taking {{ mariadb_backup_type }} database backup via Mariabackup
   become: true
   kolla_docker:
     action: "start_container"
     command: "bash -c 'sudo -E kolla_set_configs && /usr/local/bin/kolla_mariadb_backup.sh'"
     common_options: "{{ docker_common_options }}"
     detach: False
-    image: "{{ mariabackup_image_full }}"
+    # NOTE(mgoddard): Try to use the same image as the MariaDB server container
+    # to avoid compatibility issues. See
+    # https://bugs.launchpad.net/kolla-ansible/+bug/2058644.
+    image: "{{ container_facts.mariadb.Image | default(mariadb_services.mariadb.image) }}"
     name: "mariabackup"
     restart_policy: oneshot
     remove_on_exit: True

ansible/roles/service-rabbitmq/tasks/main.yml

@@ -20,7 +20,7 @@
         module_args:
           user: "{{ item.user }}"
           password: "{{ item.password }}"
-          node: "rabbit@{{ ansible_facts.hostname }}"
+          node: "rabbit@{{ hostvars[service_rabbitmq_delegate_host]['ansible_facts']['hostname'] }}"
           update_password: always
           vhost: "{{ item.vhost }}"
           configure_priv: ".*"

ansible/roles/skyline/tasks/stop.yml

@@ -1,11 +1,6 @@
 ---
-- name: "Stopping skyline containers"
+- import_role:
+    name: service-stop
   vars:
-    service: "{{ item.value }}"
-  docker_container:
-    name: "{{ service.container_name }}"
-    state: stopped
-  when:
-    - service.enabled | bool
-    - service.container_name not in skip_stop_containers
-  with_dict: "{{ skyline_services }}"
+    project_services: "{{ skyline_services }}"
+    service_name: "{{ project_name }}"

ansible/roles/swift/templates/proxy-server.conf.j2

@@ -99,5 +99,5 @@ use = egg:swift#s3api
 
 [filter:s3token]
 use = egg:swift#s3token
-auth_uri = {{ keystone_internal_url }}
+auth_uri = {{ keystone_internal_url }}/v3
 {% endif %}

ansible/roles/trove/templates/trove.conf.j2

@@ -19,9 +19,9 @@ transport_url = {{ rpc_transport_url }}
 nova_proxy_admin_pass = {{ trove_keystone_password }}
 nova_proxy_admin_tenant_name = service
 nova_proxy_admin_user = trove
-remote_nova_client = trove.common.single_tenant_remote.nova_client_trove_admin
-remote_cinder_client = trove.common.single_tenant_remote.cinder_client_trove_admin
-remote_neutron_client = trove.common.single_tenant_remote.neutron_client_trove_admin
+remote_nova_client = trove.common.clients_admin.nova_client_trove_admin
+remote_cinder_client = trove.common.clients_admin.cinder_client_trove_admin
+remote_neutron_client = trove.common.clients_admin.neutron_client_trove_admin
 {% endif %}
 
 nova_compute_endpoint_type = internalURL

doc/source/reference/orchestration-and-nfv/tacker-guide.rst

@@ -17,7 +17,6 @@ to be enabled to operate correctly.
 
 * Core compute stack (nova, neutron, glance, etc)
 * Heat
-* Mistral + Redis
 * Barbican (Required only for multinode)
 
 Optionally tacker supports the following services and features.
@@ -43,8 +42,6 @@ In order to enable them, you need to edit the file
 
    enable_tacker: "yes"
    enable_barbican: "yes"
-   enable_mistral: "yes"
-   enable_redis: "yes"
 
 .. warning::
 
@@ -87,11 +84,6 @@ create a very basic VNF from a cirros image in ``demo-net`` network.
 
 Install python-tackerclient.
 
-.. note::
-
-   Barbican, heat and mistral python clients are in tacker's
-   requirements and will be installed as dependency.
-
 .. code-block:: console
 
    $ pip install python-tackerclient

releasenotes/notes/bug-1937120-cd1ad24a9a4be739.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fixes trove module imports.
+    Path to the modules needed by trove-api changed in source trove
+    package so the configuration was updated.
+    `LP#1937120 <https://launchpad.net/bugs/1937120>`__

releasenotes/notes/bug-2058644-1db8786303234787.yaml

@@ -0,0 +1,15 @@
+---
+upgrade:
+  - |
+    MariaDB backup now uses the same image as the running MariaDB server. The
+    following variables relating to MariaDB backups are no longer used and have
+    been removed:
+
+    * ``mariabackup_image``
+    * ``mariabackup_tag``
+    * ``mariabackup_image_full``
+fixes:
+  - |
+    Modifies the MariaDB procedure to use the same container image as the
+    running MariaDB server container. This should prevent compatibility issues
+    that may cause the backup to fail.

releasenotes/notes/fix-cinder-backup-tls-swift-cb694ed1df8caa26.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixed 'cinder-backup' service when Swift with TLS enabled.
+    `LP#2051986 <https://bugs.launchpad.net/kolla-ansible/+bug/2051986>`__

releasenotes/notes/skyline-stop-7eb0d8770335a9ca.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes skyline's old format of stop task.
+    It used docker_container which would cause
+    problems with podman deployments.

tests/test-core-openstack.sh

@@ -205,7 +205,7 @@ function resize_instance {
             openstack --debug server show ${name}
             return 1
         fi
-        sleep 1
+        sleep 2
     done
 }