Decouple nova04delta network stage from control plane stage

Separate the networking components MetalLB NetConfig and
Net-attach-def for the control plane stage. This allows to
apply Day 2 operattions smoothly, including potential adoption jobs,
where it only deploys networking omitting control plane.

Inspired by the similar work done for uni04delta DT.

Also fix relative paths in examples/dt to point the main dt dir.

Signed-off-by: Bohdan Dobrelia <[email protected]>

Author: bogdando

automation/vars/nova04delta-adoption.yaml

@@ -0,0 +1,29 @@
+---
+vas:
+  nova04delta-adoption:
+    stages:
+      - name: nncp-configuration
+        path: examples/dt/nova/nova04delta/control-plane/networking/nncp
+        wait_conditions:
+          - >-
+            oc -n openstack wait nncp
+            -l osp/nncm-config-type=standard
+            --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured
+            --timeout=5m
+        values:
+          - name: network-values
+            src_file: values.yaml
+        build_output: nncp.yaml
+
+      - name: network-configuration
+        path: examples/dt/nova/nova04delta/control-plane/networking
+        wait_conditions:
+          - >-
+            oc -n metallb-system wait pod
+            -l app=metallb -l component=speaker
+            --for condition=Ready
+            --timeout=5min
+        values:
+          - name: network-values
+            src_file: nncp/values.yaml
+        build_output: networking.yaml

automation/vars/nova04delta.yaml

@@ -2,31 +2,48 @@
 vas:
   nova04delta:
     stages:
-      - path: examples/dt/nova/nova04delta/nncp
+      - name: nncp-configuration
+        path: examples/dt/nova/nova04delta/control-plane/networking/nncp
         wait_conditions:
           - >-
             oc -n openstack wait nncp
             -l osp/nncm-config-type=standard
             --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured
-            --timeout=60s
+            --timeout=5m
         values:
           - name: network-values
             src_file: values.yaml
         build_output: nncp.yaml
 
-      - path: examples/dt/nova/nova04delta
+      - name: network-configuration
+        path: examples/dt/nova/nova04delta/control-plane/networking
         wait_conditions:
           - >-
-            oc -n openstack wait osctlplane controlplane --for condition=Ready
-            --timeout=600s
+            oc -n metallb-system wait pod
+            -l app=metallb -l component=speaker
+            --for condition=Ready
+            --timeout=5m
         values:
           - name: network-values
             src_file: nncp/values.yaml
-          - name: service-values
+        build_output: network.yaml
+
+      - name: control-plane
+        path: examples/dt/nova/nova04delta/control-plane
+        wait_conditions:
+          - >-
+            oc -n openstack wait osctlplane controlplane
+            --for condition=Ready
+            --timeout=60m
+        values:
+          - name: network-values
+            src_file: networking/nncp/values.yaml
+          - name: service-values.yaml
             src_file: service-values.yaml
         build_output: control-plane.yaml
 
-      - path: examples/dt/nova/nova04delta/edpm/nodeset
+      - name: nodeset 1
+        path: examples/dt/nova/nova04delta/edpm/nodeset
         wait_conditions:
           - >-
             oc -n openstack wait
@@ -37,7 +54,8 @@ vas:
             src_file: values.yaml
         build_output: nodeset.yaml
 
-      - path: examples/dt/nova/nova04delta/edpm/nodeset2
+      - name: nodeset 2
+        path: examples/dt/nova/nova04delta/edpm/nodeset2
         wait_conditions:
           - >-
             oc -n openstack wait
@@ -48,7 +66,8 @@ vas:
             src_file: values.yaml
         build_output: nodeset2.yaml
 
-      - path: examples/dt/nova/nova04delta/edpm/deployment
+      - name: deployment
+        path: examples/dt/nova/nova04delta/edpm/deployment
         wait_conditions:
           - >-
             oc -n openstack wait
@@ -59,7 +78,8 @@ vas:
             src_file: values.yaml
         build_output: deployment.yaml
 
-      - path: examples/dt/nova/nova04delta/edpm-post-driver/deployment
+      - name: post deployment
+        path: examples/dt/nova/nova04delta/edpm-post-driver/deployment
         wait_conditions:
           - >-
             oc -n openstack wait

dt/nova/nova04delta/kustomization.yaml

@@ -18,9 +18,6 @@ transformers:
         create: true
 
 components:
-  - ../../../lib/networking/metallb
-  - ../../../lib/networking/netconfig
-  - ../../../lib/networking/nad
   - ../../../lib/control-plane
 
 replacements:

dt/nova/nova04delta/networking/kustomization.yaml

@@ -0,0 +1,23 @@
+---
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+transformers:
+  # Set namespace to OpenStack on all namespaced objects without a namespace
+  - |-
+    apiVersion: builtin
+    kind: NamespaceTransformer
+    metadata:
+      name: _ignored_
+      namespace: openstack
+    setRoleBindingSubjects: none
+    unsetOnly: true
+    fieldSpecs:
+      - path: metadata/name
+        kind: Namespace
+        create: true
+
+components:
+  - ../../../../lib/networking/metallb
+  - ../../../../lib/networking/netconfig
+  - ../../../../lib/networking/nad

examples/dt/nova/nova04delta/README.md

@@ -34,7 +34,7 @@ A count of `X` PCI devices may be requested through `"pci_passthrough:alias"="nv
 $ openstack --os-compute-api=2.86 flavor set --property "pci_passthrough:alias"="nvidia_a2:1" device_passthrough
 ```
 
-### Control Plane (`examples/dt/nova/nova04delta/service-values.yaml`)
+### Control Plane (`examples/dt/nova/nova04delta/control-plane/service-values.yaml`)
 
 *   `[pci]alias`: Creates an alias for a specific GPU type. This allows users to request a GPU by a friendly name (e.g., `nvidia_a2`) when creating a VM. This configuration should match the configuration found on the compute nodes.
     ```yaml

examples/dt/nova/nova04delta/control-plane.md renamed to examples/dt/nova/nova04delta/control-plane/README.md

@@ -10,9 +10,9 @@ Switch to the "openstack" namespace
 ```
 oc project openstack
 ```
-Change to the nfv/sriov directory
+Change to the nova/nova04delta directory
 ```
-cd architecture/examples/va/nfv/sriov
+cd architecture/examples/dt/nova/nova04delta
 ```
 Edit the [nncp/values.yaml](nncp/values.yaml) and
 [service-values.yaml](service-values.yaml) files to suit 

examples/dt/nova/nova04delta/control-plane/kustomization.yaml

@@ -0,0 +1,21 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+components:
+  - ../../../../../dt/nova/nova04delta/edpm/nodeset
+
+resources:
+  - control-plane/networking/nncp/values.yaml
+  - control-plane/service-values.yaml
+  - edpm/nodeset/values.yaml
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+components:
+  - ../../../../../dt/nova/nova04delta/
+
+resources:
+  - networking/nncp/values.yaml
+  - service-values.yaml

examples/dt/nova/nova04delta/kustomization.yaml renamed to examples/dt/nova/nova04delta/control-plane/networking/kustomization.yaml

@@ -3,8 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 components:
-  - ../../../../dt/nova/nova04delta/
+  - ../../../../../../dt/nova/nova04delta/networking
 
 resources:
   - nncp/values.yaml
-  - service-values.yaml

examples/dt/nova/nova04delta/control-plane/networking/nncp/.gitignore

@@ -0,0 +1,2 @@
+# Generated files
+nncp.yaml

examples/dt/nova/nova04delta/nncp/kustomization.yaml renamed to examples/dt/nova/nova04delta/control-plane/networking/nncp/kustomization.yaml

@@ -18,7 +18,7 @@ transformers:
         create: true
 
 components:
-  - ../../../../../lib/nncp
+  - ../../../../../../../lib/nncp
 
 resources:
   - values.yaml