Merge pull request #771 from stackhpc/upstream/2025.1-2025-08-18

Synchronise 2025.1 with upstream

Author: priteau

ansible/roles/mariadb/tasks/register.yml

@@ -46,7 +46,7 @@
       name: "{{ mariadb_backup_database_user }}"
       password: "{{ mariadb_backup_database_password }}"
       host: "%"
-      priv: "*.*:CREATE TABLESPACE,RELOAD,PROCESS,SUPER,LOCK TABLES,BINLOG MONITOR/{{ mariadb_backup_database_schema }}.mariadb_backup_history:CREATE"
+      priv: "*.*:RELOAD,PROCESS,LOCK TABLES,BINLOG MONITOR/{{ mariadb_backup_database_schema }}.mariadb_backup_history:CREATE,ALTER,INSERT"
       append_privs: True
   when:
     - enable_mariabackup | bool

ansible/roles/neutron/tasks/config.yml

@@ -118,6 +118,7 @@
     dest: "{{ node_config_directory }}/{{ item.key }}/neutron_vpnaas.conf"
     mode: "0660"
   when:
+    - enable_neutron_vpnaas | bool
     - item.key in services_need_neutron_vpnaas_conf
   with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}"
 

ansible/roles/neutron/templates/neutron-l3-agent-wrapper.sh.j2

@@ -17,6 +17,6 @@ neutron-netns-cleanup \
 
 neutron-l3-agent \
         --config-file /etc/neutron/neutron.conf \
-        --config-file /etc/neutron/neutron_vpnaas.conf \
-        --config-file /etc/neutron/l3_agent.ini{% if enable_neutron_fwaas | bool %} \
+        --config-file /etc/neutron/l3_agent.ini{% if enable_neutron_vpnaas | bool %} \
+        --config-file /etc/neutron/neutron_vpnaas.conf{% endif %}{% if enable_neutron_fwaas | bool %} \
         --config-file /etc/neutron/fwaas_driver.ini{% endif %}

ansible/roles/neutron/templates/neutron-l3-agent.json.j2

@@ -12,13 +12,13 @@
             "dest": "/etc/neutron/neutron.conf",
             "owner": "neutron",
             "perm": "0600"
-        },
+        }{% if enable_neutron_vpnaas | bool %},
         {
             "source": "{{ container_config_directory }}/neutron_vpnaas.conf",
             "dest": "/etc/neutron/neutron_vpnaas.conf",
             "owner": "neutron",
             "perm": "0600"
-        }{% if enable_neutron_fwaas | bool %},
+        }{% endif %}{% if enable_neutron_fwaas | bool %},
         {
             "source": "{{ container_config_directory }}/fwaas_driver.ini",
             "dest": "/etc/neutron/fwaas_driver.ini",

ansible/roles/neutron/templates/neutron-server.json.j2

@@ -1,5 +1,5 @@
 {
-    "command": "neutron-server --config-file /etc/neutron/neutron.conf {% if neutron_plugin_agent in ['openvswitch', 'linuxbridge', 'ovn'] %} --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-file /etc/neutron/neutron_vpnaas.conf {% elif neutron_plugin_agent in ['vmware_nsxv', 'vmware_nsxv3', 'vmware_nsxp', 'vmware_dvs'] %} --config-file /etc/neutron/plugins/vmware/nsx.ini {% endif %}{% if enable_neutron_fwaas | bool %}--config-file /etc/neutron/fwaas_driver.ini{% endif %}",
+    "command": "neutron-server --config-file /etc/neutron/neutron.conf {% if neutron_plugin_agent in ['openvswitch', 'linuxbridge', 'ovn'] %} --config-file /etc/neutron/plugins/ml2/ml2_conf.ini {% if enable_neutron_vpnaas | bool %}--config-file /etc/neutron/neutron_vpnaas.conf{% endif %}{% elif neutron_plugin_agent in ['vmware_nsxv', 'vmware_nsxv3', 'vmware_nsxp', 'vmware_dvs'] %} --config-file /etc/neutron/plugins/vmware/nsx.ini {% endif %}{% if enable_neutron_fwaas | bool %}--config-file /etc/neutron/fwaas_driver.ini{% endif %}",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/neutron.conf",
@@ -15,12 +15,14 @@
             "perm": "0600"
         },
 {% endif %}
+{% if enable_neutron_vpnaas | bool %}
         {
             "source": "{{ container_config_directory }}/neutron_vpnaas.conf",
             "dest": "/etc/neutron/neutron_vpnaas.conf",
             "owner": "neutron",
             "perm": "0600"
         },
+{% endif %}
 {% if enable_neutron_taas | bool %}
         {
             "source": "{{ container_config_directory }}/neutron_taas.conf",

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

@@ -1,8 +1,6 @@
-{% if enable_neutron_vpnaas | bool %}
 [service_providers]
 {% if neutron_plugin_agent == 'vmware_nsxv' %}
 service_provider = VPN:vmware:vmware_nsx.services.vpnaas.nsxv.ipsec_driver.NSXvIPsecVpnDriver:default
 {% else %}
 service_provider = VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default
 {% endif %}
-{% endif %}

zuul.d/project.yaml

@@ -42,7 +42,8 @@
         - kolla-ansible-rocky9-upgrade
         - kolla-ansible-rocky9-slurp-upgrade:
             voting: false
-        - kolla-ansible-debian-upgrade
+        - kolla-ansible-debian-upgrade:
+            voting: false
         - kolla-ansible-debian-slurp-upgrade:
             voting: false
         - kolla-ansible-ubuntu-upgrade
@@ -101,7 +102,7 @@
         - openstack-tox-py312
         - kolla-ansible-debian
         - kolla-ansible-debian-mariadb
-        - kolla-ansible-debian-upgrade
+        # - kolla-ansible-debian-upgrade
         - kolla-ansible-debian-podman
         - kolla-ansible-rocky9
         - kolla-ansible-rocky9-mariadb