WIP [unialpha] Add octavia vlan network on networkers

automation/net-env/uni01alpha.yaml

@@ -159,6 +159,19 @@ instances:
         skip_nm: false
         trunk_parent: ctlplane
         vlan_id: 22
+      octavia:
+        interface_name: eth1.23
+        ip_v4: 172.23.0.106
+        is_trunk_parent: false
+        mac_addr: '52:54:00:53:17:40'
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: octavia
+        parent_interface: eth1
+        prefix_length_v4: 24
+        skip_nm: false
+        trunk_parent: ctlplane
+        vlan_id: 23
   networker-1:
     hostname: networker-1
     name: networker-1
@@ -199,6 +212,19 @@ instances:
         skip_nm: false
         trunk_parent: ctlplane
         vlan_id: 22
+      octavia:
+        interface_name: eth1.23
+        ip_v4: 172.23.0.107
+        is_trunk_parent: false
+        mac_addr: '52:54:00:53:13:45'
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: octavia
+        parent_interface: eth1
+        prefix_length_v4: 24
+        skip_nm: false
+        trunk_parent: ctlplane
+        vlan_id: 23
   networker-2:
     hostname: networker-2
     name: networker-2
@@ -239,6 +265,19 @@ instances:
         skip_nm: false
         trunk_parent: ctlplane
         vlan_id: 22
+      octavia:
+        interface_name: eth1.23
+        ip_v4: 172.23.0.108
+        is_trunk_parent: false
+        mac_addr: '52:54:00:53:11:51'
+        mtu: 1500
+        netmask_v4: 255.255.255.0
+        network_name: octavia
+        parent_interface: eth1
+        prefix_length_v4: 24
+        skip_nm: false
+        trunk_parent: ctlplane
+        vlan_id: 23
   ocp-0:
     hostname: master-0
     name: ocp-0

dt/uni01alpha/networking/netconfig/kustomization.yaml

@@ -43,6 +43,15 @@ replacements:
           kind: NetConfig
         fieldPaths:
           - spec.networks.[name=tenant].dnsDomain
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.octavia.dnsDomain
+    targets:
+      - select:
+          kind: NetConfig
+        fieldPaths:
+          - spec.networks.[name=octavia].dnsDomain
 
   # NetConfig MTU
   - source:
@@ -81,6 +90,15 @@ replacements:
           kind: NetConfig
         fieldPaths:
           - spec.networks.[name=tenant].mtu
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.octavia.mtu
+    targets:
+      - select:
+          kind: NetConfig
+        fieldPaths:
+          - spec.networks.[name=octavia].mtu
 
   # NetConfig subnets
   - source:
@@ -119,3 +137,12 @@ replacements:
           kind: NetConfig
         fieldPaths:
           - spec.networks.[name=tenant].subnets
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.octavia.subnets
+    targets:
+      - select:
+          kind: NetConfig
+        fieldPaths:
+          - spec.networks.[name=octavia].subnets

dt/uni01alpha/networking/netconfig/netconfig.yaml

@@ -26,3 +26,8 @@ spec:
       subnets:
         - _replaced_
       mtu: 1500
+    - dnsDomain: _replaced_
+      name: octavia
+      subnets:
+        - _replaced_
+      mtu: 1500

dt/uni01alpha/networking/nncp/kustomization.yaml

@@ -35,24 +35,6 @@ patches:
             base-iface: _replaced_
             id: _replaced_
 
-  - target:
-      kind: NodeNetworkConfigurationPolicy
-      name: master-0
-    patch: |-
-      - op: add
-        path: /spec/desiredState/interfaces/-
-        value:
-          description: Octavia bridge
-          mtu: 1500
-          name: octbr
-          type: linux-bridge
-          bridge:
-            options:
-              stp:
-                enabled: false
-            port:
-              - name: octavia
-
   - target:
       kind: NodeNetworkConfigurationPolicy
       name: master-1
@@ -68,24 +50,6 @@ patches:
             base-iface: _replaced_
             id: _replaced_
 
-  - target:
-      kind: NodeNetworkConfigurationPolicy
-      name: master-1
-    patch: |-
-      - op: add
-        path: /spec/desiredState/interfaces/-
-        value:
-          description: Octavia bridge
-          mtu: 1500
-          name: octbr
-          type: linux-bridge
-          bridge:
-            options:
-              stp:
-                enabled: false
-            port:
-              - name: octavia
-
   - target:
       kind: NodeNetworkConfigurationPolicy
       name: master-2
@@ -101,24 +65,6 @@ patches:
             base-iface: _replaced_
             id: _replaced_
 
-  - target:
-      kind: NodeNetworkConfigurationPolicy
-      name: master-2
-    patch: |-
-      - op: add
-        path: /spec/desiredState/interfaces/-
-        value:
-          description: Octavia bridge
-          mtu: 1500
-          name: octbr
-          type: linux-bridge
-          bridge:
-            options:
-              stp:
-                enabled: false
-            port:
-              - name: octavia
-
   - target:
       kind: NodeNetworkConfigurationPolicy
       name: master-0

examples/dt/uni01alpha/control-plane/networking/nncp/values.yaml

@@ -161,6 +161,13 @@ data:
 
   octavia:
     dnsDomain: octavia.openstack.lab
+    subnets:
+      - allocationRanges:
+          - end: 172.23.0.250
+            start: 172.23.0.100
+        cidr: 172.23.0.0/24
+        name: subnet1
+        vlan: 23
     mtu: 1500
     vlan: 23
     base_iface: enp7s0

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

@@ -129,7 +129,6 @@ data:
     ovnController:
       nicMappings:
         datacentre: ocpbr
-        octavia: octbr
         ironic: ironic
       availability-zones:
         - zone-1

examples/dt/uni01alpha/networker/nodeset/values.yaml

@@ -90,6 +90,8 @@ data:
         subnetName: subnet1
       - name: tenant
         subnetName: subnet1
+      - name: octavia
+        subnetName: subnet1
 
     nodes:
       edpm-networker-0:
@@ -105,6 +107,8 @@ data:
             subnetName: subnet1
           - name: tenant
             subnetName: subnet1
+          - name: octavia
+            subnetName: subnet1
       edpm-networker-1:
         hostName: edpm-networker-1
         ansible:
@@ -118,6 +122,8 @@ data:
             subnetName: subnet1
           - name: tenant
             subnetName: subnet1
+          - name: octavia
+            subnetName: subnet1
       edpm-networker-2:
         hostName: edpm-networker-2
         ansible:
@@ -131,6 +137,8 @@ data:
             subnetName: subnet1
           - name: tenant
             subnetName: subnet1
+          - name: octavia
+            subnetName: subnet1
 
     services:
       - bootstrap