From d35e3e0daef67546eded457a92186eb043575d69 Mon Sep 17 00:00:00 2001 From: James Denton Date: Thu, 8 Dec 2022 14:42:43 -0600 Subject: [PATCH] Update AIO to use OVN-style provider network for Octavia This patch updates the aio openstack_user_config template to use the OVN/OVS style provider network definition for Octavia testing. Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_neutron/+/867087 Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/867113 Change-Id: I4bcd4a9b74f41cdf57cb9e8ea76d03a3720833a4 --- etc/openstack_deploy/openstack_user_config.yml.aio.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/openstack_deploy/openstack_user_config.yml.aio.j2 b/etc/openstack_deploy/openstack_user_config.yml.aio.j2 index 178b79f962..66599756d3 100644 --- a/etc/openstack_deploy/openstack_user_config.yml.aio.j2 +++ b/etc/openstack_deploy/openstack_user_config.yml.aio.j2 @@ -111,15 +111,15 @@ global_overrides: {% endif %} {% if 'octavia' in bootstrap_host_scenarios_expanded %} - network: - container_bridge: "br-lbaas" + container_bridge: "br-octavia" container_type: "veth" container_interface: "eth14" - host_bind_override: "eth14" + network_interface: "eth14" ip_from_q: "lbaas" type: "flat" net_name: "lbaas" group_binds: - - neutron_linuxbridge_agent + - neutron_ovn_gateway - octavia-worker - octavia-housekeeping - octavia-health-manager