Merge pull request #502 from sauragar/adoption_uni05epsilon

Decouple uni05epsilon network from control plane

Ticket: OSPNW-903

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

Author: softwarefactory-project-zuul[bot]

automation/net-env/uni05epsilon-adoption.yaml

@@ -0,0 +1,26 @@
+---
+vas:
+  uni05epsilon-adoption:
+    stages:
+      - path: examples/dt/uni05epsilon/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
+
+      - path: examples/dt/uni05epsilon/control-plane/networking
+        wait_conditions:
+          - >-
+            oc -n metallb-system wait pod
+            -l app=metallb -l component=speaker
+            --for condition=Ready
+        values:
+          - name: network-values
+            src_file: nncp/values.yaml
+        build_output: networking.yaml

automation/vars/uni05epsilon-adoption.yaml

@@ -2,7 +2,7 @@
 vas:
   uni05epsilon:
     stages:
-      - path: examples/dt/uni05epsilon/control-plane/nncp
+      - path: examples/dt/uni05epsilon/control-plane/networking/nncp
         wait_conditions:
           - >-
             oc -n openstack wait nncp
@@ -14,6 +14,17 @@ vas:
             src_file: values.yaml
         build_output: nncp.yaml
 
+      - path: examples/dt/uni05epsilon/control-plane/networking
+        wait_conditions:
+          - >-
+            oc -n metallb-system wait pod
+            -l app=metallb -l component=speaker
+            --for condition=Ready
+        values:
+          - name: network-values
+            src_file: nncp/values.yaml
+        build_output: networking.yaml
+
       - path: examples/dt/uni05epsilon/control-plane
         wait_conditions:
           - >-
@@ -23,7 +34,7 @@ vas:
             --timeout=60m
         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

automation/vars/uni05epsilon.yaml

@@ -17,43 +17,9 @@ transformers:
         create: true
 
 components:
-  - ../../lib/networking/metallb
-  - ../../lib/networking/netconfig
-  - ../../lib/networking/nad
   - ../../lib/control-plane
 
-patches:
-  #
-  # The storagemgmt network template needed for CephHCI
-  #
-  - target:
-      version: v1beta1
-      kind: NetConfig
-      name: netconfig
-    patch: |-
-      - op: add
-        path: /spec/networks/-
-        value:
-          dnsDomain: _replaced_
-          name: storagemgmt
-          subnets:
-            - _replaced_
-          mtu: 1500
-
 replacements:
-  #
-  # The storagemgmt network replacements
-  #
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.storagemgmt.dnsDomain
-    targets:
-      - select:
-          kind: NetConfig
-        fieldPaths:
-          - spec.networks.[name=storagemgmt].dnsDomain
-
   - source:
       kind: ConfigMap
       name: service-values
@@ -113,23 +79,3 @@ replacements:
           - spec.nova.template.cellTemplates.cell2
         options:
           create: true
-
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.storagemgmt.mtu
-    targets:
-      - select:
-          kind: NetConfig
-        fieldPaths:
-          - spec.networks.[name=storagemgmt].mtu
-
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.storagemgmt.subnets
-    targets:
-      - select:
-          kind: NetConfig
-        fieldPaths:
-          - spec.networks.[name=storagemgmt].subnets

dt/uni05epsilon/kustomization.yaml

@@ -0,0 +1,74 @@
+---
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+transformers:
+  - |-
+    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
+
+patches:
+  #
+  # The storagemgmt network template needed for CephHCI
+  #
+  - target:
+      version: v1beta1
+      kind: NetConfig
+      name: netconfig
+    patch: |-
+      - op: add
+        path: /spec/networks/-
+        value:
+          dnsDomain: _replaced_
+          name: storagemgmt
+          subnets:
+            - _replaced_
+          mtu: 1500
+
+replacements:
+  #
+  # The storagemgmt network replacements
+  #
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.storagemgmt.dnsDomain
+    targets:
+      - select:
+          kind: NetConfig
+        fieldPaths:
+          - spec.networks.[name=storagemgmt].dnsDomain
+
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.storagemgmt.mtu
+    targets:
+      - select:
+          kind: NetConfig
+        fieldPaths:
+          - spec.networks.[name=storagemgmt].mtu
+
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.storagemgmt.subnets
+    targets:
+      - select:
+          kind: NetConfig
+        fieldPaths:
+          - spec.networks.[name=storagemgmt].subnets

dt/uni05epsilon/networking/kustomization.yaml

@@ -21,48 +21,49 @@ cd architecture/examples/dt/uni05epsilon
 ```
 
 Edit [control-plane/service-values.yaml](control-plane/service-values.yaml) and
-[control-plane/nncp/values.yaml](control-plane/nncp/values.yaml).
+[control-plane/networking/nncp/values.yaml](control-plane/networking/nncp/values.yaml).
 
-Apply node network configuration
+## Apply node network configuration
 
+Generate the node network configuration
 ```bash
-# Change to the Node Network Configuration folder.
-pushd control-plane/nncp
-
-# Generate the configuration
-kustomize build > nncp.yaml
-
-# Apply the generated configuration
+kustomize build control-plane/networking/nncp > nncp.yaml
+```
+Apply the NNCP CRs
+```
 oc apply -f nncp.yaml
-
-# Wait till the network configuration is applied.
+```
+Wait for NNCPs to be available
+```
 oc wait nncp \
     -l osp/nncm-config-type=standard \
     --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured \
     --timeout=300s
-
-# Change back the working directory
-popd
 ```
 
-Generate and apply the control-plane configurations.
-
-```bash
-# Navigate to control-panel
-pushd control-plane
+## Apply remaining networking configuration
 
-# Generate the CR
-kustomize build > control-plane.yaml
+Generate the reminaing networking configuration
+```
+kustomize build control-plane/networking > networking.yaml
+```
+Apply the networking CRs
+```
+oc apply -f networking.yaml
+```
 
-# Verify that control-plane.yaml includes the valid access credentials
-# for the NetApp storage and provide the information if missing.
+## Apply the control-plane configuration.
 
-# Apply the CR
+Generate the control-plane CRs.
+```bash
+kustomize build control-plane/ > control-plane.yaml
+```
+Apply the CRs
+```bash
 oc apply -f control-plane.yaml
+```
 
-# Wait for control plane to be available
+Wait for control plane to be available
+```bash
 oc wait osctlplane controlplane --for condition=Ready --timeout=600s
-
-# Change back the working directory
-popd
 ```

examples/dt/uni05epsilon/control-plane.md

@@ -6,5 +6,5 @@ components:
   - ../../../../dt/uni05epsilon
 
 resources:
-  - nncp/values.yaml
+  - networking/nncp/values.yaml
   - service-values.yaml

examples/dt/uni05epsilon/control-plane/kustomization.yaml

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

examples/dt/uni05epsilon/control-plane/networking/kustomization.yaml

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