Merge pull request #680 from stackhpc/upstream/2024.1-2025-02-03

Synchronise 2024.1 with upstream

Author: priteau

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

@@ -264,5 +264,5 @@ backend_url = {{ redis_connection_string }}
 # and https://review.opendev.org/466098 for details
 # NOTE(jan.gutter): etcd v3.4 removed the default `v3alpha` api_version. Until
 # tooz defaults to a newer version, we should explicitly specify `v3`
-backend_url = etcd3+{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ etcd_client_port }}?api_version=v3{% if openstack_cacert %}?ca_cert={{ openstack_cacert }}{% endif %}
+backend_url = etcd3+{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ etcd_client_port }}?api_version=v3{% if openstack_cacert %}&ca_cert={{ openstack_cacert }}{% endif %}
 {% endif %}

ansible/roles/common/defaults/main.yml

@@ -183,6 +183,8 @@ fluentd_input_openstack_services:
     enabled: "{{ enable_nova | bool }}"
   - name: octavia
     enabled: "{{ enable_octavia | bool }}"
+  - name: placement
+    enabled: "{{ enable_placement | bool }}"
   - name: tacker
     enabled: "{{ enable_tacker | bool }}"
   - name: trove

ansible/roles/placement/templates/placement-api-wsgi.conf.j2

@@ -28,7 +28,7 @@ LogLevel info
     <IfVersion >= 2.4>
       ErrorLogFormat "%{cu}t %M"
     </IfVersion>
-    ErrorLog "{{ log_dir }}/placement-api.log"
+    ErrorLog "{{ log_dir }}/placement-api-error.log"
     LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
     CustomLog "{{ log_dir }}/placement-api-access.log" logformat
     <Directory {{ wsgi_directory }}>

doc/source/admin/mariadb-backup-and-restore.rst

@@ -83,7 +83,7 @@ following options on the first database node:
 
    docker run --rm -it --volumes-from mariadb --name dbrestore \
       --volume mariadb_backup:/backup \
-      quay.io/openstack.kolla/centos-source-mariadb-server:|KOLLA_OPENSTACK_RELEASE| \
+      quay.io/openstack.kolla/mariadb-server:|KOLLA_OPENSTACK_RELEASE|-rocky-9 \
       /bin/bash
    (dbrestore) $ cd /backup
    (dbrestore) $ rm -rf /backup/restore
@@ -105,7 +105,7 @@ place, again on the first node:
 
    docker run --rm -it --volumes-from mariadb --name dbrestore \
       --volume mariadb_backup:/backup \
-      quay.io/openstack.kolla/centos-source-mariadb-server:|KOLLA_OPENSTACK_RELEASE| \
+      quay.io/openstack.kolla/mariadb-server:|KOLLA_OPENSTACK_RELEASE|-rocky-9 \
       /bin/bash
    (dbrestore) $ rm -rf /var/lib/mysql/*
    (dbrestore) $ rm -rf /var/lib/mysql/\.[^\.]*
@@ -148,7 +148,7 @@ incremental backup,
 
    docker run --rm -it --volumes-from mariadb --name dbrestore \
       --volume mariadb_backup:/backup --tmpfs /backup/restore \
-      quay.io/openstack.kolla/centos-source-mariadb-server:|KOLLA_OPENSTACK_RELEASE| \
+      quay.io/openstack.kolla/mariadb-server:|KOLLA_OPENSTACK_RELEASE|-rocky-9 \
       /bin/bash
    (dbrestore) $ cd /backup
    (dbrestore) $ rm -rf /backup/restore

lint-requirements.txt

@@ -4,6 +4,7 @@ bandit>=1.1.0 # Apache-2.0
 bashate>=0.5.1 # Apache-2.0
 codespell<2.3.0 # GPLv2
 doc8>=0.6.0 # Apache-2.0
-hacking>=3.0.1,<3.1.0 # Apache-2.0
+hacking>=3.0.1 # Apache-2.0
+pycodestyle>=2.11.0 # MIT
 reno>=3.1.0 # Apache-2.0
 yamllint>=1.22.0 #GPL3

releasenotes/notes/bug-2095607-f4d9d5aebebddfc8.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fixes Apache and placement writing to the same log file.
+    Apache placement VirtualHost ErrorLog has been renamed to
+    ``placement-api-error.log`` (similar to other services).
+    `LP#[2095607] <https://launchpad.net/bugs/2095607>`__

releasenotes/notes/fix-cinder-etcd-backend-url-3ca1fa04293c16b5.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes a bug where the etcd3gw ``backend_url`` in cinder.conf would be
+    invalid when ``openstack_cacert`` was set.
+    `LP#2085908 <https://bugs.launchpad.net/kolla-ansible/+bug/2085908>`__

tests/templates/globals-default.j2

@@ -11,6 +11,9 @@ network_address_family: "{{ address_family }}"
 kolla_container_engine: "{{ container_engine }}"
 docker_restart_policy: "no"
 
+docker_apt_url: "http://{{ zuul_site_mirror_fqdn }}:8080/docker/{{ ansible_facts.distribution | lower }}"
+docker_yum_url: "http://{{ zuul_site_mirror_fqdn }}:8080/docker/centos"
+
 {% if container_engine == 'podman' %}
 podman_debug: true
 podman_registry_mirrors:
@@ -244,7 +247,7 @@ horizon_external_fqdn: "horizon.external"
 keystone_external_fqdn: "keystone.external"
 neutron_external_fqdn: "neutron.external"
 nova_external_fqdn: "nova.external"
-nova_novncproxy_external_fqdn: "novncproxy.external"
+nova_novncproxy_fqdn: "novncproxy.external"
 placement_external_fqdn: "placement.external"
 {% endif %}
 

tests/test-core-openstack.sh

@@ -447,6 +447,17 @@ function test_internal_dns_integration {
         openstack server create --image cirros --flavor m1.tiny --network dns-test-network ${SERVER_NAME}
 
         SERVER_ID=$(openstack server show ${SERVER_NAME} -f value -c id)
+        attempt=0
+        while [[ -z $(openstack port list --device-id ${SERVER_ID} -f value -c ID) ]]; do
+            echo "Port for server ${SERVER_NAME} not available yet"
+            attempt=$((attempt+1))
+            if [[ $attempt -eq 10 ]]; then
+                echo "ERROR: Port for server ${SERVER_NAME} failed to become available"
+                openstack port list --device-id ${SERVER_ID}
+                return 1
+            fi
+            sleep $attempt
+        done
         PORT_ID=$(openstack port list --device-id ${SERVER_ID} -f value -c ID)
 
         DNS_ASSIGNMENT=$(openstack port show ${PORT_ID} -f json -c dns_assignment)

tests/test-magnum.sh

@@ -61,6 +61,17 @@ function test_designate {
     openstack server create --image cirros --flavor m1.tiny --network tenant-dns-test  ${SERVER_NAME}
 
     SERVER_ID=$(openstack server show ${SERVER_NAME} -f value -c id)
+    attempt=0
+    while [[ -z $(openstack port list --device-id ${SERVER_ID} -f value -c ID) ]]; do
+        echo "Port for server ${SERVER_NAME} not available yet"
+        attempt=$((attempt+1))
+        if [[ $attempt -eq 10 ]]; then
+            echo "ERROR: Port for server ${SERVER_NAME} failed to become available"
+            openstack port list --device-id ${SERVER_ID}
+            return 1
+        fi
+        sleep $attempt
+    done
     PORT_ID=$(openstack port list --device-id ${SERVER_ID} -f value -c ID)
 
     openstack floating ip create public1 --port ${PORT_ID}