Merge branch 'stackhpc/wallaby' into feature/wallaby/caso

Author: jovial

etc/kayobe/kolla.yml

@@ -148,6 +148,10 @@ kolla_sources:
     type: git
     location: https://github.com/stackhpc/magnum.git
     reference: stackhpc/wallaby
+  neutron-base:
+    type: git
+    location: https://github.com/stackhpc/neutron.git
+    reference: stackhpc/{{ openstack_release }}
   neutron-base-plugin-networking-generic-switch:
     type: git
     location: https://github.com/stackhpc/networking-generic-switch.git

etc/kayobe/kolla/globals.yml

@@ -7,10 +7,12 @@ docker_yum_gpgkey: "https://download.docker.com/linux/centos/gpg"
 bifrost_tag: wallaby-20230207T194135
 blazar_tag: wallaby-20230303T172322
 caso_tag: wallaby-20230303T172322
+neutron_tag: wallaby-20230303T174325
 {% else %}
 bifrost_tag: wallaby-20230215T160405
 blazar_tag: wallaby-20230303T172458
 caso_tag: wallaby-20230303T172458
+neutron_tag: wallaby-20230303T213058
 {% endif %}
 
 glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}"