Merge pull request #581 from openstack-k8s-operators/revert-566-OSPRH-17472

Revert "[BGP] Set edpm_network_config_nmstate=false"

Reverts #566
Revert reason: OSPRH-17472 has been resolved

Reviewed-by: Andrew Bays <[email protected]>

Author: softwarefactory-project-zuul[bot]

examples/dt/bgp-l3-xl/edpm/computes/r0/values.yaml

@@ -37,7 +37,6 @@ data:
             nic2: 6a:fe:54:3f:8a:02  # CHANGEME
           edpm-r0-compute-1:
             nic2: 6b:fe:54:3f:8a:02  # CHANGEME
-        edpm_network_config_nmstate: false
         edpm_network_config_template: |
           ---
           {% set mtu_list = [ctlplane_mtu] %}
@@ -49,6 +48,7 @@ data:
           - type: ovs_bridge
             name: {{ neutron_physical_bridge_name }}
             use_dhcp: false
+            use_dhcpv6: true  # needed to enable IPv6 on bridges
           - type: interface
             name: nic1
             use_dhcp: true

examples/dt/bgp-l3-xl/edpm/computes/r1/values.yaml

@@ -37,7 +37,6 @@ data:
             nic2: 6a:fe:54:3f:8a:02  # CHANGEME
           edpm-compute-1:
             nic2: 6b:fe:54:3f:8a:02
-        edpm_network_config_nmstate: false
         edpm_network_config_template: |
           ---
           {% set mtu_list = [ctlplane_mtu] %}
@@ -49,6 +48,7 @@ data:
           - type: ovs_bridge
             name: {{ neutron_physical_bridge_name }}
             use_dhcp: false
+            use_dhcpv6: true  # needed to enable IPv6 on bridges
           - type: interface
             name: nic1
             use_dhcp: true

examples/dt/bgp-l3-xl/edpm/computes/r2/values.yaml

@@ -37,7 +37,6 @@ data:
             nic2: 6a:fe:54:3f:8a:02  # CHANGEME
           edpm-r2-compute-1:
             nic2: 6a:fe:54:3f:8a:02  # CHANGEME
-        edpm_network_config_nmstate: false
         edpm_network_config_template: |
           ---
           {% set mtu_list = [ctlplane_mtu] %}
@@ -49,6 +48,7 @@ data:
           - type: ovs_bridge
             name: {{ neutron_physical_bridge_name }}
             use_dhcp: false
+            use_dhcpv6: true  # needed to enable IPv6 on bridges
           - type: interface
             name: nic1
             use_dhcp: true

examples/dt/bgp-l3-xl/edpm/networkers/r0/values.yaml

@@ -35,7 +35,6 @@ data:
         edpm_network_config_os_net_config_mappings:
           edpm-r0-networker-0:
             nic2: 6d:fe:54:3f:8a:02  # CHANGEME
-        edpm_network_config_nmstate: false
         edpm_network_config_template: |
           ---
           {% set mtu_list = [ctlplane_mtu] %}
@@ -47,6 +46,7 @@ data:
           - type: ovs_bridge
             name: {{ neutron_physical_bridge_name }}
             use_dhcp: false
+            use_dhcpv6: true  # needed to enable IPv6 on bridges
           - type: interface
             name: nic1
             use_dhcp: true

examples/dt/bgp-l3-xl/edpm/networkers/r1/values.yaml

@@ -35,7 +35,6 @@ data:
         edpm_network_config_os_net_config_mappings:
           edpm-r1-networker-0:
             nic2: 6d:fe:54:3f:8a:02  # CHANGEME
-        edpm_network_config_nmstate: false
         edpm_network_config_template: |
           ---
           {% set mtu_list = [ctlplane_mtu] %}
@@ -47,6 +46,7 @@ data:
           - type: ovs_bridge
             name: {{ neutron_physical_bridge_name }}
             use_dhcp: false
+            use_dhcpv6: true  # needed to enable IPv6 on bridges
           - type: interface
             name: nic1
             use_dhcp: true

examples/dt/bgp-l3-xl/edpm/networkers/r2/values.yaml

@@ -35,7 +35,6 @@ data:
         edpm_network_config_os_net_config_mappings:
           edpm-r2-networker-0:
             nic2: 6d:fe:54:3f:8a:02  # CHANGEME
-        edpm_network_config_nmstate: false
         edpm_network_config_template: |
           ---
           {% set mtu_list = [ctlplane_mtu] %}
@@ -47,6 +46,7 @@ data:
           - type: ovs_bridge
             name: {{ neutron_physical_bridge_name }}
             use_dhcp: false
+            use_dhcpv6: true  # needed to enable IPv6 on bridges
           - type: interface
             name: nic1
             use_dhcp: true

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

@@ -34,7 +34,6 @@ data:
         edpm_network_config_os_net_config_mappings:
           edpm-r0-compute-0:
             nic2: 6a:fe:54:3f:8a:02  # CHANGEME
-        edpm_network_config_nmstate: false
         edpm_network_config_template: |
           ---
           {% set mtu_list = [ctlplane_mtu] %}
@@ -46,6 +45,7 @@ data:
           - type: ovs_bridge
             name: {{ neutron_physical_bridge_name }}
             use_dhcp: false
+            use_dhcpv6: true  # needed to enable IPv6 on bridges
           - type: interface
             name: nic1
             use_dhcp: true

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

@@ -34,7 +34,6 @@ data:
         edpm_network_config_os_net_config_mappings:
           edpm-r1-compute-0:
             nic2: 6a:fe:54:3f:8a:02  # CHANGEME
-        edpm_network_config_nmstate: false
         edpm_network_config_template: |
           ---
           {% set mtu_list = [ctlplane_mtu] %}
@@ -46,6 +45,7 @@ data:
           - type: ovs_bridge
             name: {{ neutron_physical_bridge_name }}
             use_dhcp: false
+            use_dhcpv6: true  # needed to enable IPv6 on bridges
           - type: interface
             name: nic1
             use_dhcp: true

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

@@ -34,7 +34,6 @@ data:
         edpm_network_config_os_net_config_mappings:
           edpm-r2-compute-0:
             nic2: 6a:fe:54:3f:8a:02  # CHANGEME
-        edpm_network_config_nmstate: false
         edpm_network_config_template: |
           ---
           {% set mtu_list = [ctlplane_mtu] %}
@@ -46,6 +45,7 @@ data:
           - type: ovs_bridge
             name: {{ neutron_physical_bridge_name }}
             use_dhcp: false
+            use_dhcpv6: true  # needed to enable IPv6 on bridges
           - type: interface
             name: nic1
             use_dhcp: true

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

@@ -34,7 +34,6 @@ data:
         edpm_network_config_os_net_config_mappings:
           edpm-r0-networker-0:
             nic2: 6d:fe:54:3f:8a:02  # CHANGEME
-        edpm_network_config_nmstate: false
         edpm_network_config_template: |
           ---
           {% set mtu_list = [ctlplane_mtu] %}
@@ -46,6 +45,7 @@ data:
           - type: ovs_bridge
             name: {{ neutron_physical_bridge_name }}
             use_dhcp: false
+            use_dhcpv6: true  # needed to enable IPv6 on bridges
           - type: interface
             name: nic1
             use_dhcp: true