Decouple network and controlplane

Author: jamepark4

automation/vars/nova02beta.yaml

@@ -2,7 +2,7 @@
 vas:
   nova02beta:
     stages:
-      - path: examples/dt/nova/nova02beta/nncp
+      - path: examples/dt/nova/nova02beta/networking/nncp
         wait_conditions:
           - >-
             oc -n openstack wait nncp
@@ -14,14 +14,26 @@ vas:
             src_file: values.yaml
         build_output: nncp.yaml
 
+      - path: examples/dt/nova/nova02beta/networking
+        wait_conditions:
+          - >-
+            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
+        build_output: network.yaml
+
       - path: examples/dt/nova/nova02beta
         wait_conditions:
           - >-
             oc -n openstack wait osctlplane controlplane --for condition=Ready
             --timeout=600s
         values:
           - name: network-values
-            src_file: nncp/values.yaml
+            src_file: networking/nncp/values.yaml
           - name: service-values
             src_file: service-values.yaml
         build_output: control-plane.yaml

dt/nova/nova02beta/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/nova02beta/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/nova02beta/control-plane.md

@@ -10,16 +10,13 @@ Switch to the "openstack" namespace
 ```
 oc project openstack
 ```
-Change to the nova/nova02beta directory
+Change to the nova/nova02beta/networking directory
 ```
-cd architecture/examples/dt/nova/nova02beta
+cd architecture/examples/dt/nova/nova02beta/networking/
 ```
-Edit the [nncp/values.yaml](nncp/values.yaml) and
-[service-values.yaml](service-values.yaml) files to suit 
-your environment.
+Edit the [nncp/values.yaml](networking/nncp/values.yaml)
 ```
 vi nncp/values.yaml
-vi service-values.yaml
 ```
 
 ## Apply node network configuration
@@ -37,7 +34,37 @@ Wait for NNCPs to be available
 oc wait nncp -l osp/nncm-config-type=standard --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured --timeout=300s
 ```
 
-## Apply networking and control-plane configuration
+## Create NAD's, IPAddressPool, and NetConfig
+
+Generate Network attachment definitions, IPAddressPools and remaining 
+networking CRs. Note that the associated values for these resources are also
+defined in [nncp/values.yaml](networking/nncp/values.yaml)
+```
+kustomize build > network.yaml
+```
+Apply the CRs
+```
+oc apply -f network.yaml
+```
+
+Wait for networking resources to be available
+```
+oc -n metallb-system wait pod -l app=metallb -l component=speaker --for condition=Ready --timeout=5m
+```
+
+## Create control-plane configuration
+
+Change to the architecture/examples/dt/nova/nova02beta directory
+```
+cd architecture/examples/dt/nova/nova02beta
+```
+Edit the [service-values.yaml](service-values.yaml) files to suit your
+environment.
+```
+vi service-values.yaml
+```
+
+## Apply control-plane configuration
 
 Generate the control-plane and networking CRs.
 ```
@@ -47,8 +74,7 @@ Apply the CRs
 ```
 oc apply -f control-plane.yaml
 ```
-
 Wait for control plane to be available
 ```
 oc wait osctlplane controlplane --for condition=Ready --timeout=600s
-```
+```

examples/dt/nova/nova02beta/dataplane.md

@@ -55,7 +55,7 @@ oc apply -f dataplane-deployment.yaml
 ```
 Wait for dataplane deployment to finish
 ```
-oc wait osdpns openstack-edpm --for condition=Ready --timeout=40m
+oc -n openstack wait osdpd edpm-deployment --for condition=Ready --timeout=90m
 ```
 
 ## Generate yamls necessary to finialize Nvidia GPU installation
@@ -82,7 +82,6 @@ Start the deployment
 ```
 oc apply -f dataplane-post-driver-deployment.yaml
 ```
-
 Wait for dataplane deployment to finish
 ```
 oc wait osdpd edpm-deployment-post-driver --for condition=Ready --timeout=20m
@@ -93,10 +92,10 @@ Change to the nova/nova02beta/edpm-deploy-provider directory
 ```
 cd architecture/examples/dt/nova/nova02beta/edpm-deploy-provider/
 ```
-Edit the [nodeset/values.yaml](edpm-deploy-provider/nodeset/values.yaml) files to suit 
+Edit the [dataplaneservice/values.yaml](edpm-deploy-provider/dataplaneservice/values.yaml) files to suit 
 your environment.
 ```
-vi nodeset/values.yaml
+vi dataplaneservice/values.yaml
 ```
 Edit the [deployment/values.yaml](edpm-deploy-provider/deployment/values.yaml) files to suit 
 your environment.
@@ -119,7 +118,7 @@ oc apply -f dataplane-provider-service.yaml
 ```
 Wait for dataplane service to finish
 ```
-oc wait osdpns openstack-edpm --for condition=SetupReadyy --timeout=60m
+oc -n default wait ns openstack --for jsonpath='{.status.phase}'=Active --timeout=5m
 ```
 Start the deployment
 ```

examples/dt/nova/nova02beta/kustomization.yaml

@@ -9,5 +9,5 @@ components:
   ## https://github.com/kubernetes-sigs/kustomize/blob/master/examples/remoteBuild.md
 
 resources:
-  - nncp/values.yaml
+  - networking/nncp/values.yaml
   - service-values.yaml

examples/dt/nova/nova02beta/networking/kustomization.yaml

@@ -0,0 +1,9 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+components:
+  - ../../../../../dt/nova/nova02beta/networking/
+
+resources:
+  - nncp/values.yaml

examples/dt/nova/nova02beta/nncp/kustomization.yaml renamed to examples/dt/nova/nova02beta/networking/nncp/kustomization.yaml

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

examples/dt/nova/nova02beta/nncp/values.yaml renamed to examples/dt/nova/nova02beta/networking/nncp/values.yaml

@@ -200,7 +200,8 @@
     - examples/dt/nova/nova02beta/edpm/deployment
     - examples/dt/nova/nova02beta/edpm/nodeset
     - examples/dt/nova/nova02beta/edpm/nodeset2
-    - examples/dt/nova/nova02beta/nncp
+    - examples/dt/nova/nova02beta/networking
+    - examples/dt/nova/nova02beta/networking/nncp
     - lib
     name: rhoso-architecture-validate-nova02beta
     parent: rhoso-architecture-base-job