Merge pull request #685 from stackhpc/upstream/master-2025-02-24

Synchronise master with upstream

Author: priteau

ansible/roles/cinder/defaults/main.yml

@@ -270,6 +270,7 @@ cinder_backend_pure_nvme_tcp_name: "Pure-FlashArray-nvme-tcp"
 
 cinder_ceph_backends:
   - name: "{{ cinder_backend_ceph_name }}"
+    backend_name: "{{ cinder_backend_ceph_name }}"
     cluster: "{{ ceph_cluster }}"
     user: "{{ ceph_cinder_user }}"
     pool: "{{ ceph_cinder_pool_name }}"

ansible/roles/cinder/tasks/upgrade.yml

@@ -10,13 +10,6 @@
 
 - import_tasks: check-containers.yml
 
-# TODO(bbezak): Remove this task in the Dalmatian cycle.
-- import_role:
-    name: service-ks-register
-  vars:
-    service_ks_register_auth: "{{ openstack_cinder_auth }}"
-    service_ks_register_user_roles: "{{ cinder_ks_user_roles }}"
-
 - name: Flush handlers
   meta: flush_handlers
 

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

@@ -156,7 +156,7 @@ target_protocol = iscsi
 {% for backend in cinder_ceph_backends %}
 [{{ backend.name }}]
 volume_driver = cinder.volume.drivers.rbd.RBDDriver
-volume_backend_name = {{ backend.name }}
+volume_backend_name = {{ backend.backend_name | default(backend.name) }}
 rbd_pool = {{ backend.pool }}
 rbd_ceph_conf = /etc/ceph/{{ backend.cluster }}.conf
 rados_connect_timeout = 5

ansible/roles/ironic/tasks/upgrade.yml

@@ -32,10 +32,3 @@
 
 - include_tasks: legacy_upgrade.yml
   when: not ironic_enable_rolling_upgrade | bool
-
-# TODO(bbezak): Remove this task in the Dalmatian cycle.
-- import_role:
-    name: service-ks-register
-  vars:
-    service_ks_register_auth: "{{ openstack_ironic_auth }}"
-    service_ks_register_user_roles: "{{ ironic_ks_user_roles }}"

ansible/roles/nova/tasks/upgrade.yml

@@ -1,11 +1,4 @@
 ---
-# TODO(bbezak): Remove this task in the Dalmatian cycle.
-- import_role:
-    name: service-ks-register
-  vars:
-    service_ks_register_auth: "{{ openstack_nova_auth }}"
-    service_ks_register_user_roles: "{{ nova_ks_user_roles }}"
-
 # Create new set of configs on nodes
 - import_tasks: config.yml
 

ansible/roles/prometheus/templates/prometheus.yml.j2

@@ -178,17 +178,17 @@ scrape_configs:
 {% endfor %}
     relabel_configs:
       - source_labels: [__address__]
-        regex: (\w+):(\w+):(.+)
+        regex: ([^:]+):([^:]+):(.+)
         target_label: service
         replacement: ${1}
       - source_labels: [__address__]
-        regex: (\w+):(\w+):(.+)
+        regex: ([^:]+):([^:]+):(.+)
         target_label: __param_module
         replacement: ${2}
       - source_labels: [__param_module]
         target_label: module
       - source_labels: [__address__]
-        regex: (\w+):(\w+):(.+)
+        regex: ([^:]+):([^:]+):(.+)
         target_label: __param_target
         replacement: ${3}
       - source_labels: [__param_target]

doc/source/reference/networking/neutron.rst

@@ -75,15 +75,15 @@ provisioning, controllers might have access to two physical networks:
 
    neutron_external_interface: "eth1,eth2"
    neutron_bridge_name: "br-ex1,br-ex2"
-   neutron_physical_network: "physnet1,physnet2"
+   neutron_physical_networks: "physnet1,physnet2"
 
 While compute nodes have access only to ``physnet2``.
 
 .. code-block:: yaml
 
    neutron_external_interface: "eth1"
    neutron_bridge_name: "br-ex1"
-   neutron_physical_network: "physnet2"
+   neutron_physical_networks: "physnet2"
 
 Example: shared interface
 -------------------------

releasenotes/notes/cinder-ceph-backend-name-0984e44da7905a81.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Added support for explicitly setting ``volume_backend_name`` for
+    Cinder Ceph backends by the new variable ``backend_name`` in
+    the ``cinder_ceph_backends`` dictionary configuration.

releasenotes/notes/fix-blackbox-regex-b16f3f86563de6db.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fixes the regex used to match blackbox exporter targets in the
+    ``prometheus.yml.j2`` template to be less strict. Previously we were using
+    ``\w`` which did not allow for names with periods or hyphens. The service
+    and module labels can now contain all characters except for a colon.

tests/run.yml

@@ -202,17 +202,13 @@
             mode: 0777
 
         - name: Download Ironic Python Agent (IPA) images
-          vars:
-            # TODO(mnasiadka): Revert back to master when it works
-            # tinyipa_image: "tinyipa-{{ zuul.branch | replace('/', '-') }}"
-            tinyipa_image: "tinyipa-stable-2024.2"
           get_url:
             url: "https://tarballs.opendev.org/openstack/ironic-python-agent/tinyipa/files/{{ item.src }}"
             dest: "/etc/kolla/config/ironic/{{ item.dest }}"
           with_items:
-            - src: "{{ tinyipa_image }}.gz"
+            - src: "tinyipa-{{ zuul.branch | replace('/', '-') }}.gz"
               dest: ironic-agent.initramfs
-            - src: "{{ tinyipa_image }}.vmlinuz"
+            - src: "tinyipa-{{ zuul.branch | replace('/', '-') }}.vmlinuz"
               dest: ironic-agent.kernel
       when: scenario == "ironic"
 
@@ -670,14 +666,11 @@
           vars:
             ansible_core_version_constraint: >-
               {{ ansible_core_version_min if is_upgrade or base_distro != 'ubuntu' else ansible_core_version_max }}
-            ansible_version_constraint: >-
-              {{ ansible_version_min if is_upgrade or base_distro != 'ubuntu' else ansible_version_max }}
           pip:
             extra_args: "-c {{ upper_constraints_file }}"
             name:
               - "{{ kolla_ansible_src_dir }}"
               - "ansible-core{{ ansible_core_version_constraint }}"
-              - "ansible{{ ansible_version_constraint }}"
               - "ara<1.0.0"
             virtualenv: "{{ kolla_ansible_venv_path }}"
           when: is_slurp