Merge pull request openstack-k8s-operators#264 from eduolivares/bgp-vlan-transparency

[BGP_DT01] Fixes in neutron and NAD

Changes in BGP DT01:

neutron vlan_transparency enabled
Removed unused BGP NADs. Only one BGP NAD is used for the moment and it has been fixed.

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

Author: softwarefactory-project-zuul[bot]

dt/bgp/kustomization.yaml

@@ -27,7 +27,6 @@ transformers:
 components:
   - ../../lib/networking
   - networking/bgpmetallb
-  - networking/nad
   - ../../lib/control-plane
 
 resources:

dt/bgp/networking/nad/kustomization.yaml

@@ -55,7 +55,6 @@ patches:
   - target:
       kind: NetworkAttachmentDefinition
       labelSelector: "osp/net-attach-def-type=bgp"
-      name: bgpnet-[3-6]-[0-1]
     path: ocp_network_template.yaml
 
 replacements:
@@ -138,82 +137,34 @@ replacements:
   - source:
       kind: ConfigMap
       name: network-values
-      fieldPath: data.bgp.net-attach-def.node3.bgpnet0
+      fieldPath: data.bgp.net-attach-def.node6
     targets:
       - select:
           kind: NetworkAttachmentDefinition
-          name: bgpnet-3-0
-        fieldPaths:
-          - spec.config
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.bgp.net-attach-def.node3.bgpnet1
-    targets:
-      - select:
-          kind: NetworkAttachmentDefinition
-          name: bgpnet-3-1
-        fieldPaths:
-          - spec.config
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.bgp.net-attach-def.node4.bgpnet0
-    targets:
-      - select:
-          kind: NetworkAttachmentDefinition
-          name: bgpnet-4-0
-        fieldPaths:
-          - spec.config
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.bgp.net-attach-def.node4.bgpnet1
-    targets:
-      - select:
-          kind: NetworkAttachmentDefinition
-          name: bgpnet-4-1
-        fieldPaths:
-          - spec.config
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.bgp.net-attach-def.node5.bgpnet0
-    targets:
-      - select:
-          kind: NetworkAttachmentDefinition
-          name: bgpnet-5-0
-        fieldPaths:
-          - spec.config
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.bgp.net-attach-def.node5.bgpnet1
-    targets:
-      - select:
-          kind: NetworkAttachmentDefinition
-          name: bgpnet-5-1
+          name: bgpnet-worker-3
         fieldPaths:
           - spec.config
+  # disable OCP workers as gateway nodes
   - source:
       kind: ConfigMap
-      name: network-values
-      fieldPath: data.bgp.net-attach-def.node6.bgpnet0
+      name: service-values
+      fieldPath: data.ovn.ovnController.external-ids
     targets:
       - select:
-          kind: NetworkAttachmentDefinition
-          name: bgpnet-6-0
+          kind: OpenStackControlPlane
         fieldPaths:
-          - spec.config
-  # disable OCP workers as gateway nodes
+          - spec.ovn.template.ovnController.external-ids
+        options:
+          create: true
+  # configure neutron customServiceConfig
   - source:
       kind: ConfigMap
       name: service-values
-      fieldPath: data.ovn.ovnController.external-ids
+      fieldPath: data.neutron.customServiceConfig
     targets:
       - select:
           kind: OpenStackControlPlane
         fieldPaths:
-          - spec.ovn.template.ovnController.external-ids
+          - spec.neutron.template.customServiceConfig
         options:
           create: true