Merge pull request #901 from stackhpc/upstream/2026.1-2026-07-13

Synchronise 2026.1 with upstream

Author: Alex-Welsh

ansible/group_vars/all/neutron.yml

@@ -28,7 +28,7 @@ neutron_plugin_agent: "openvswitch"
 # Valid options are [ internal, infoblox ]
 neutron_ipam_driver: "internal"
 
-eutron_external_interface: "eth1"
+neutron_external_interface: "eth1"
 
 #######################
 # Neutron options

ansible/roles/heat/templates/heat-api-cfn.json.j2

@@ -30,8 +30,7 @@
             "dest": "/etc/heat/certs/heat-key.pem",
             "owner": "heat",
             "perm": "0600"
-        }
-        {% endif %}{% if kolla_copy_ca_into_containers | bool %},
+        }{% endif %}{% if kolla_copy_ca_into_containers | bool %},
         {
             "source": "{{ container_config_directory }}/ca-certificates",
             "dest": "/var/lib/kolla/share/ca-certificates",

ansible/roles/heat/templates/heat-api.json.j2

@@ -30,8 +30,7 @@
             "dest": "/etc/heat/certs/heat-key.pem",
             "owner": "heat",
             "perm": "0600"
-        }
-        {% endif %}{% if kolla_copy_ca_into_containers | bool %},
+        }{% endif %}{% if kolla_copy_ca_into_containers | bool %},
         {
             "source": "{{ container_config_directory }}/ca-certificates",
             "dest": "/var/lib/kolla/share/ca-certificates",