Merge pull request #394 from raukadah/sync_patches

Backport default.yaml split patches It backports following patches: #375 #383 #379 #384 #373 Reviewed-by: Ella Shulman <ellashulman1@gmail.com> Reviewed-by: Cédric Jeanneret
openstack-k8s-operators · Sep 11, 2024 · ab2e02a · ab2e02a
2 parents da8b8bb + 613f451
commit ab2e02a
Show file tree

Hide file tree

Showing 14 changed files with 421 additions and 379 deletions.
diff --git a/.ci/automation-schema.yaml b/.ci/automation-schema.yaml
@@ -4,7 +4,7 @@
 # We are using yamale to validate files
 # https://github.com/23andMe/Yamale
 ---
-vas: map(include('_architecture'), key=str())
+vas: map(include('_architecture'), key=str(), min=1, max=1)
 
 ---
 # Define various nested types

diff --git a/.ci/validate-schema-paths.py b/.ci/validate-schema-paths.py
@@ -24,6 +24,8 @@ def __run_file(self, f):
             content = yaml.safe_load(fh)
         for scenario in content['vas']:
             print(f'  Checking scenario: {scenario}')
+            assert (rel.name == f'{scenario}.yaml'), \
+            f'!! {rel.name} does not match {scenario}.yaml'
             self.__validate(content['vas'][scenario])
 
     def __validate(self, scenario):

diff --git a/automation/mocks/nfv-ovs-dpdk-sriov-hci.yaml b/automation/mocks/nfv-ovs-dpdk-sriov-hci.yaml
@@ -0,0 +1,20 @@
+---
+cifmw_baremetal_hosts:
+  compute-0:
+    connection: ipmi://10.10.100.100
+    boot_mode: UEFI
+    nics:
+      - mac: "89:9a:b7:cb:4a:3f"
+        network: provision
+    credentials_file: "/home/user/foo.yaml"
+    root_device_hint_field: "wwnWithExtension"
+    root_device_hint: "0x6509a4c0ac82ff002dbccf463196ca41"
+  compute-1:
+    connection: ipmi://10.10.100.101
+    boot_mode: UEFI
+    nics:
+      - mac: "53:b0:4d:06:56:ea"
+        network: provision
+    credentials_file: "/home/user/foo.yaml"
+    root_device_hint_field: "wwnWithExtension"
+    root_device_hint: "0x55cd2e414e372c06"
diff --git a/automation/vars/bgp.yaml b/automation/vars/bgp.yaml
@@ -51,81 +51,3 @@ vas:
           - name: edpm-deployment-values
             src_file: values.yaml
         build_output: deployment-dataplane.yaml
-  bgp_dt01:
-    stages:
-      - pre_stage_run:
-          - name: Apply taint on worker-3
-            type: cr
-            definition:
-              spec:
-                taints:
-                  - effect: NoSchedule
-                    key: testOperator
-                    value: 'true'
-                  - effect: NoExecute
-                    key: testOperator
-                    value: 'true'
-            kind: Node
-            resource_name: worker-3
-            state: patched
-        path: examples/dt/bgp/bgp_dt01/control-plane/nncp
-        wait_conditions:
-          - >-
-            oc -n openstack wait nncp
-            -l osp/nncm-config-type=standard
-            --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured
-            --timeout=60s
-        values:
-          - name: network-values
-            src_file: values.yaml
-        build_output: nncp.yaml
-
-      - path: examples/dt/bgp/bgp_dt01/control-plane
-        wait_conditions:
-          - >-
-            oc -n openstack wait openstackcontrolplane
-            controlplane
-            --for condition=Ready
-            --timeout=30m
-        values:
-          - name: network-values
-            src_file: nncp/values.yaml
-          - name: service-values
-            src_file: service-values.yaml
-        build_output: control-plane.yaml
-
-      - path: examples/dt/bgp/bgp_dt01/edpm/networkers
-        wait_conditions:
-          - >-
-            oc -n openstack wait openstackdataplanenodeset
-            networker-nodes
-            --for condition=SetupReady
-            --timeout=600s
-        values:
-          - name: edpm-networker-nodeset-values
-            src_file: values.yaml
-        build_output: edpm-networker-nodeset.yaml
-
-      - path: examples/dt/bgp/bgp_dt01/edpm/computes
-        wait_conditions:
-          - >-
-            oc -n openstack wait openstackdataplanenodeset
-            compute-nodes
-            --for condition=SetupReady
-            --timeout=600s
-        values:
-          - name: edpm-compute-nodeset-values
-            src_file: values.yaml
-        build_output: edpm-compute-nodeset.yaml
-
-      - path: examples/dt/bgp/bgp_dt01/edpm/deployment
-        wait_conditions:
-          - >-
-            oc -n openstack wait openstackdataplanedeployment
-            edpm-deployment
-            --for condition=Ready
-            --timeout=3800s
-        values:
-          - name: edpm-deployment-values
-            src_file: values.yaml
-        build_output: edpm-deployment.yaml
diff --git a/automation/vars/bgp_dt01.yaml b/automation/vars/bgp_dt01.yaml
@@ -0,0 +1,80 @@
+---
+vas:
+  bgp_dt01:
+    stages:
+      - pre_stage_run:
+          - name: Apply taint on worker-3
+            type: cr
+            definition:
+              spec:
+                taints:
+                  - effect: NoSchedule
+                    key: testOperator
+                    value: 'true'
+                  - effect: NoExecute
+                    key: testOperator
+                    value: 'true'
+            kind: Node
+            resource_name: worker-3
+            state: patched
+        path: examples/dt/bgp/bgp_dt01/control-plane/nncp
+        wait_conditions:
+          - >-
+            oc -n openstack wait nncp
+            -l osp/nncm-config-type=standard
+            --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured
+            --timeout=60s
+        values:
+          - name: network-values
+            src_file: values.yaml
+        build_output: nncp.yaml
+
+      - path: examples/dt/bgp/bgp_dt01/control-plane
+        wait_conditions:
+          - >-
+            oc -n openstack wait openstackcontrolplane
+            controlplane
+            --for condition=Ready
+            --timeout=30m
+        values:
+          - name: network-values
+            src_file: nncp/values.yaml
+          - name: service-values
+            src_file: service-values.yaml
+        build_output: control-plane.yaml
+
+      - path: examples/dt/bgp/bgp_dt01/edpm/networkers
+        wait_conditions:
+          - >-
+            oc -n openstack wait openstackdataplanenodeset
+            networker-nodes
+            --for condition=SetupReady
+            --timeout=600s
+        values:
+          - name: edpm-networker-nodeset-values
+            src_file: values.yaml
+        build_output: edpm-networker-nodeset.yaml
+
+      - path: examples/dt/bgp/bgp_dt01/edpm/computes
+        wait_conditions:
+          - >-
+            oc -n openstack wait openstackdataplanenodeset
+            compute-nodes
+            --for condition=SetupReady
+            --timeout=600s
+        values:
+          - name: edpm-compute-nodeset-values
+            src_file: values.yaml
+        build_output: edpm-compute-nodeset.yaml
+
+      - path: examples/dt/bgp/bgp_dt01/edpm/deployment
+        wait_conditions:
+          - >-
+            oc -n openstack wait openstackdataplanedeployment
+            edpm-deployment
+            --for condition=Ready
+            --timeout=3800s
+        values:
+          - name: edpm-deployment-values
+            src_file: values.yaml
+        build_output: edpm-deployment.yaml