Merge pull request #883 from stackhpc/upstream/master-2026-06-15

Synchronise master with upstream

Author: Alex-Welsh

ansible/group_vars/all/neutron.yml

@@ -24,9 +24,6 @@ neutron_keystone_user: "neutron"
 # Valid options are [ openvswitch, ovn ]
 neutron_plugin_agent: "openvswitch"
 
-# Valid option is [ internal ]
-neutron_ipam_driver: "internal"
-
 eutron_external_interface: "eth1"
 
 #######################

ansible/roles/kolla_toolbox/handlers/main.yml

@@ -23,3 +23,7 @@
   become: true
   ansible.builtin.command: "{{ kolla_container_engine }} exec -t {{ service['container_name'] }} ansible --version"
   changed_when: false
+  register: result
+  until: result.rc == 0
+  retries: 5
+  delay: 5

ansible/roles/loadbalancer/templates/keepalived/check_alive_proxysql.sh.j2

@@ -3,4 +3,10 @@
 # This will return 0 when it successfully talks to the ProxySQL daemon via localhost
 # Failures return 1
 
-echo "show info" | socat unix-connect:/var/lib/kolla/proxysql/admin.sock stdio > /dev/null
+mariadb --no-defaults \
+  --protocol socket \
+  --socket=/var/lib/kolla/proxysql/admin.sock \
+  --user={{ proxysql_admin_user }} \
+  --password={{ proxysql_admin_password }} \
+  --skip-ssl \
+  -e "SELECT 1" 2>/dev/null

ansible/roles/neutron/templates/neutron.conf.j2

@@ -52,8 +52,6 @@ dns_domain = {{ neutron_dns_domain }}
 external_dns_driver = designate
 {% endif %}
 
-ipam_driver = {{ neutron_ipam_driver }}
-
 [nova]
 auth_url = {{ keystone_internal_url }}
 auth_type = password

etc/kolla/globals.yml

@@ -160,9 +160,6 @@ workaround_ansible_issue_8743: true
 # Valid options are [ openvswitch, ovn ]
 #neutron_plugin_agent: "openvswitch"
 
-# Valid options are [ internal, infoblox ]
-#neutron_ipam_driver: "internal"
-
 # Configure Neutron upgrade option, currently Kolla support
 # two upgrade ways for Neutron: legacy_upgrade and rolling_upgrade
 # The variable "neutron_enable_rolling_upgrade: true" is meaning rolling_upgrade
@@ -406,7 +403,6 @@ workaround_ansible_issue_8743: true
 #enable_neutron_sfc: false
 #enable_neutron_trunk: false
 #enable_neutron_metering: false
-#enable_neutron_infoblox_ipam_agent: false
 #enable_neutron_port_forwarding: false
 #enable_nova_serialconsole_proxy: false
 #enable_nova_ssh: true

tests/templates/globals-default.j2

@@ -246,9 +246,7 @@ octavia_network_type: "tenant"
 enable_valkey: "yes"
 {% endif %}
 
-{% if groups['all'] | length == 1 %}
 keepalived_track_script_enabled: "no"
-{% endif %}
 
 neutron_modules_extra:
   - name: 'nf_conntrack_tftp'

tests/templates/inventory.j2

@@ -325,8 +325,11 @@ neutron
 [neutron-dhcp-agent:children]
 neutron
 
+{# NOTE(mnasiadka): Remove me after 2026.2 release #}
+{% if is_upgrade %}
 [neutron-infoblox-ipam-agent:children]
 neutron
+{% endif %}
 
 [neutron-l3-agent:children]
 neutron

zuul.d/scenarios/aio.yaml

@@ -7,7 +7,7 @@
       - ^ansible/group_vars/all/(common|cron|fluentd|glance|haproxy|heat|horizon|keepalived|keystone|loadbalancer|neutron|nova|nova-cell|openvswitch|placement|proxysql|rabbitmq).yml
       - ^ansible/group_vars/baremetal/ansible-python-interpreter.yml
       - ^ansible/(action_plugins|filter_plugins|library|module_utils)/
-      - ^ansible/roles/(common|cron|fluentd|glance|haproxy-config|heat|horizon|keystone|loadbalancer|loadbalancer-config|neutron|nova|nova-cell|openvswitch|placement|proxysql|rabbitmq|service.*)/
+      - ^ansible/roles/(common|cron|fluentd|glance|haproxy-config|heat|horizon|keystone|kolla-toolbox|loadbalancer|loadbalancer-config|neutron|nova|nova-cell|openvswitch|placement|proxysql|rabbitmq|service.*)/
       - ^ansible/templates/
       - ^kolla_ansible/
       - ^roles/kolla-ansible-(deploy|tempest|test-dashboard|reconfigure)/
@@ -146,12 +146,6 @@
         - kolla-ansible-ubuntu-noble
         - kolla-ansible-ubuntu-noble-podman
         - kolla-ansible-ubuntu-noble-upgrade
-    check-arm64:
-      jobs:
-        - kolla-ansible-debian-trixie-aarch64
-        - kolla-ansible-debian-trixie-aarch64-podman
-        - kolla-ansible-debian-trixie-aarch64-upgrade
-        - kolla-ansible-ubuntu-noble-aarch64
     gate:
       jobs:
         - kolla-ansible-debian-trixie
@@ -163,3 +157,9 @@
         - kolla-ansible-ubuntu-noble
         - kolla-ansible-ubuntu-noble-upgrade
         - kolla-ansible-ubuntu-noble-podman
+    experimental:
+      jobs:
+        - kolla-ansible-debian-trixie-aarch64
+        - kolla-ansible-debian-trixie-aarch64-podman
+        - kolla-ansible-debian-trixie-aarch64-upgrade
+        - kolla-ansible-ubuntu-noble-aarch64

zuul.d/scenarios/ironic.yaml

@@ -71,6 +71,6 @@
         - kolla-ansible-rocky-10-ironic-upgrade
         - kolla-ansible-ubuntu-noble-ironic
         - kolla-ansible-ubuntu-noble-ironic-upgrade
-    check-arm64:
+    experimental:
       jobs:
         - kolla-ansible-debian-trixie-aarch64-ironic