Enable OVN-native BGP in bgp_dt01

Replace ovn-bgp-agent with neutron-ovn (OVN agent) for BGP support:
- Add ovn-bgp neutron service plugin to control plane configuration
- Add neutron-ovn-extra-config ConfigMap with OVN agent BGP extension
- Replace neutron-metadata and ovn-bgp-agent EDPM services with neutron-ovn
- Remove edpm_ovn_bgp_agent_* ansible variables (no longer needed)
- Modify edpm_network_config_template: br-bgp-0 and br-bgp-1 OVS bridges
  on top of nic3 and nic4 for each EDPM node and br-ex is removed
- Update README.md services table

OSPRH-25973

Assisted-By: Claude Opus 4.6
Signed-off-by: Eduardo Olivares <eolivare@redhat.com>

Author: eduolivares

examples/dt/bgp_dt01/README.md

@@ -83,7 +83,7 @@ network).
 | Octavia          | (default)        | Must have          |
 | Heat             | (default)        | Must have          |
 | frr              | dataplane        | Must have          |
-| ovn-bgp-agent    | dataplane        | Must have          |
+| neutron-ovn      | dataplane        | Must have          |
 
 ## Considerations/Constraints
 

examples/dt/bgp_dt01/control-plane/kustomization.yaml

@@ -8,6 +8,7 @@ components:
 resources:
   - networking/nncp/values.yaml
   - service-values.yaml
+  - neutron-ovn-extra-config.yaml
 
 transformers:
   # Set namespace to OpenStack on all namespaced objects without a namespace

examples/dt/bgp_dt01/control-plane/neutron-ovn-extra-config.yaml

@@ -0,0 +1,10 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: neutron-ovn-extra-config
+  namespace: openstack
+data:
+  99-neutron-ovn.conf: |
+    [agent]
+    extensions = metadata,ovn-bgp

examples/dt/bgp_dt01/control-plane/service-values.yaml

@@ -67,6 +67,7 @@ data:
   neutron:
     customServiceConfig: |
       [DEFAULT]
+      service_plugins = qos,ovn-router,trunk,segments,port_forwarding,log,placement,ovn-bgp
       vlan_transparent = true
       debug = true
       dns_domain = example.org.

examples/dt/bgp_dt01/edpm/computes/r0/values.yaml

@@ -24,10 +24,15 @@ data:
         edpm_ovn_bridge_mappings:
           - "datacentre:br-ex"
           - "octavia:br-octavia"
-        edpm_ovn_bgp_agent_expose_tenant_networks: true
         edpm_frr_bgp_ipv4_src_network: bgpmainnet
         edpm_frr_bgp_ipv6_src_network: bgpmainnetv6
         edpm_frr_bgp_neighbor_password: f00barZ
+        edpm_frr_ovn_vrf_learn: ovnvrf10
+        edpm_frr_ovn_vrf_expose: ovnvrf42
+        bgp_bridges:
+          - br-bgp-0
+          - br-bgp-1
+        edpm_neutron_ovn_agent_bgp_peer_bridges: "{{ bgp_bridges | join(',') }}"
         timesync_ntp_servers:
           - hostname: pool.ntp.org
         # conntrack is necessary for some tobiko tests
@@ -45,10 +50,6 @@ data:
           {%- endfor %}
           {% set min_viable_mtu = mtu_list | max %}
           network_config:
-          - type: ovs_bridge
-            name: {{ neutron_physical_bridge_name }}
-            use_dhcp: false
-            use_dhcpv6: true  # needed to enable IPv6 on bridges
           - type: ovs_bridge
             name: br-octavia
             use_dhcp: false
@@ -65,16 +66,30 @@ data:
             domain: {{ dns_search_domains }}
             addresses:
               - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
-          - type: interface
-            name: nic3
+          - type: ovs_bridge
+            name: {{ bgp_bridges[0] }}
             use_dhcp: false
+            use_dhcpv6: true  # needed to enable IPv6 on bridges
             addresses:
-            - ip_netmask: {{ bgpnet0_ip }}/30
-          - type: interface
-            name: nic4
+              - ip_netmask: {{ bgpnet0_ip }}/30
+            defroute: false
+            members:
+              - type: interface
+                name: nic3
+                # force the MAC address of the bridge to this interface
+                primary: true
+          - type: ovs_bridge
+            name: {{ bgp_bridges[1] }}
             use_dhcp: false
+            use_dhcpv6: true  # needed to enable IPv6 on bridges
             addresses:
-            - ip_netmask: {{ bgpnet1_ip }}/30
+              - ip_netmask: {{ bgpnet1_ip }}/30
+            defroute: false
+            members:
+              - type: interface
+                name: nic4
+                # force the MAC address of the bridge to this interface
+                primary: true
           - type: interface
             name: lo
             addresses:
@@ -84,8 +99,6 @@ data:
           - 192.168.122.0/24
         edpm_sshd_configure_firewall: true
         gather_facts: false
-        neutron_physical_bridge_name: br-ex
-        neutron_public_interface_name: eth1
     networks:
       - defaultRoute: true
         name: CtlPlane
@@ -120,9 +133,6 @@ data:
         ansible:
           ansibleHost: 192.168.122.100
           ansibleVars:
-            edpm_ovn_bgp_agent_local_ovn_peer_ips:
-              - 100.64.0.1
-              - 100.65.0.1
             edpm_frr_bgp_peers:
               - 100.64.0.1
               - 100.65.0.1
@@ -155,8 +165,7 @@ data:
       - reboot-os
       - install-certs
       - ovn
-      - neutron-metadata
-      - ovn-bgp-agent
+      - neutron-ovn
       - libvirt
       - nova
   nova:

examples/dt/bgp_dt01/edpm/computes/r1/values.yaml

@@ -24,10 +24,15 @@ data:
         edpm_ovn_bridge_mappings:
           - "datacentre:br-ex"
           - "octavia:br-octavia"
-        edpm_ovn_bgp_agent_expose_tenant_networks: true
         edpm_frr_bgp_ipv4_src_network: bgpmainnet
         edpm_frr_bgp_ipv6_src_network: bgpmainnetv6
         edpm_frr_bgp_neighbor_password: f00barZ
+        edpm_frr_ovn_vrf_learn: ovnvrf10
+        edpm_frr_ovn_vrf_expose: ovnvrf42
+        bgp_bridges:
+          - br-bgp-0
+          - br-bgp-1
+        edpm_neutron_ovn_agent_bgp_peer_bridges: "{{ bgp_bridges | join(',') }}"
         timesync_ntp_servers:
           - hostname: pool.ntp.org
         # conntrack is necessary for some tobiko tests
@@ -45,10 +50,6 @@ data:
           {%- endfor %}
           {% set min_viable_mtu = mtu_list | max %}
           network_config:
-          - type: ovs_bridge
-            name: {{ neutron_physical_bridge_name }}
-            use_dhcp: false
-            use_dhcpv6: true  # needed to enable IPv6 on bridges
           - type: ovs_bridge
             name: br-octavia
             use_dhcp: false
@@ -65,16 +66,30 @@ data:
             domain: {{ dns_search_domains }}
             addresses:
               - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
-          - type: interface
-            name: nic3
+          - type: ovs_bridge
+            name: {{ bgp_bridges[0] }}
             use_dhcp: false
+            use_dhcpv6: true  # needed to enable IPv6 on bridges
             addresses:
-            - ip_netmask: {{ bgpnet0_ip }}/30
-          - type: interface
-            name: nic4
+              - ip_netmask: {{ bgpnet0_ip }}/30
+            defroute: false
+            members:
+              - type: interface
+                name: nic3
+                # force the MAC address of the bridge to this interface
+                primary: true
+          - type: ovs_bridge
+            name: {{ bgp_bridges[1] }}
             use_dhcp: false
+            use_dhcpv6: true  # needed to enable IPv6 on bridges
             addresses:
-            - ip_netmask: {{ bgpnet1_ip }}/30
+              - ip_netmask: {{ bgpnet1_ip }}/30
+            defroute: false
+            members:
+              - type: interface
+                name: nic4
+                # force the MAC address of the bridge to this interface
+                primary: true
           - type: interface
             name: lo
             addresses:
@@ -84,8 +99,6 @@ data:
           - 192.168.122.0/24
         edpm_sshd_configure_firewall: true
         gather_facts: false
-        neutron_physical_bridge_name: br-ex
-        neutron_public_interface_name: eth1
     networks:
       - defaultRoute: true
         name: CtlPlane
@@ -120,9 +133,6 @@ data:
         ansible:
           ansibleHost: 192.168.123.100
           ansibleVars:
-            edpm_ovn_bgp_agent_local_ovn_peer_ips:
-              - 100.64.1.1
-              - 100.65.1.1
             edpm_frr_bgp_peers:
               - 100.64.1.1
               - 100.65.1.1
@@ -155,8 +165,7 @@ data:
       - reboot-os
       - install-certs
       - ovn
-      - neutron-metadata
-      - ovn-bgp-agent
+      - neutron-ovn
       - libvirt
       - nova
   nova:

examples/dt/bgp_dt01/edpm/computes/r2/values.yaml

@@ -24,10 +24,15 @@ data:
         edpm_ovn_bridge_mappings:
           - "datacentre:br-ex"
           - "octavia:br-octavia"
-        edpm_ovn_bgp_agent_expose_tenant_networks: true
         edpm_frr_bgp_ipv4_src_network: bgpmainnet
         edpm_frr_bgp_ipv6_src_network: bgpmainnetv6
         edpm_frr_bgp_neighbor_password: f00barZ
+        edpm_frr_ovn_vrf_learn: ovnvrf10
+        edpm_frr_ovn_vrf_expose: ovnvrf42
+        bgp_bridges:
+          - br-bgp-0
+          - br-bgp-1
+        edpm_neutron_ovn_agent_bgp_peer_bridges: "{{ bgp_bridges | join(',') }}"
         timesync_ntp_servers:
           - hostname: pool.ntp.org
         # conntrack is necessary for some tobiko tests
@@ -45,10 +50,6 @@ data:
           {%- endfor %}
           {% set min_viable_mtu = mtu_list | max %}
           network_config:
-          - type: ovs_bridge
-            name: {{ neutron_physical_bridge_name }}
-            use_dhcp: false
-            use_dhcpv6: true  # needed to enable IPv6 on bridges
           - type: ovs_bridge
             name: br-octavia
             use_dhcp: false
@@ -65,16 +66,30 @@ data:
             domain: {{ dns_search_domains }}
             addresses:
               - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
-          - type: interface
-            name: nic3
+          - type: ovs_bridge
+            name: {{ bgp_bridges[0] }}
             use_dhcp: false
+            use_dhcpv6: true  # needed to enable IPv6 on bridges
             addresses:
-            - ip_netmask: {{ bgpnet0_ip }}/30
-          - type: interface
-            name: nic4
+              - ip_netmask: {{ bgpnet0_ip }}/30
+            defroute: false
+            members:
+              - type: interface
+                name: nic3
+                # force the MAC address of the bridge to this interface
+                primary: true
+          - type: ovs_bridge
+            name: {{ bgp_bridges[1] }}
             use_dhcp: false
+            use_dhcpv6: true  # needed to enable IPv6 on bridges
             addresses:
-            - ip_netmask: {{ bgpnet1_ip }}/30
+              - ip_netmask: {{ bgpnet1_ip }}/30
+            defroute: false
+            members:
+              - type: interface
+                name: nic4
+                # force the MAC address of the bridge to this interface
+                primary: true
           - type: interface
             name: lo
             addresses:
@@ -84,8 +99,6 @@ data:
           - 192.168.122.0/24
         edpm_sshd_configure_firewall: true
         gather_facts: false
-        neutron_physical_bridge_name: br-ex
-        neutron_public_interface_name: eth1
     networks:
       - defaultRoute: true
         name: CtlPlane
@@ -120,9 +133,6 @@ data:
         ansible:
           ansibleHost: 192.168.124.100
           ansibleVars:
-            edpm_ovn_bgp_agent_local_ovn_peer_ips:
-              - 100.64.2.1
-              - 100.65.2.1
             edpm_frr_bgp_peers:
               - 100.64.2.1
               - 100.65.2.1
@@ -155,8 +165,7 @@ data:
       - reboot-os
       - install-certs
       - ovn
-      - neutron-metadata
-      - ovn-bgp-agent
+      - neutron-ovn
       - libvirt
       - nova
   nova: