From 44eb9309d1c302bd2bda38b481da8857a113e98a Mon Sep 17 00:00:00 2001 From: Miguel Angel Nieto Jimenez Date: Tue, 20 Aug 2024 12:52:43 +0200 Subject: [PATCH] Multiple nodesets for ovs-dpdk-sriov scenario Created a new dt based on ovs-dpdk-sriov va Depends-on: https://github.com/openstack-k8s-operators/ci-framework/pull/2280 --- automation/vars/ovs-dpdk-sriov-2nodesets.yaml | 60 +++++++++++++++++++ .../edpm/deployment/.gitignore | 1 + .../edpm/deployment/kustomization.yaml | 15 +++++ .../edpm/nodeset/kustomization.yaml | 6 ++ .../edpm/nodeset2/.gitignore | 1 + .../edpm/nodeset2/kustomization.yaml | 53 ++++++++++++++++ .../kustomization.yaml | 6 ++ .../nncp/kustomization.yaml | 6 ++ zuul.d/projects.yaml | 1 + zuul.d/validations.yaml | 12 ++++ 10 files changed, 161 insertions(+) create mode 100644 automation/vars/ovs-dpdk-sriov-2nodesets.yaml create mode 100644 examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/deployment/.gitignore create mode 100644 examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/deployment/kustomization.yaml create mode 100644 examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset/kustomization.yaml create mode 100644 examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset2/.gitignore create mode 100644 examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset2/kustomization.yaml create mode 100644 examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/kustomization.yaml create mode 100644 examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/nncp/kustomization.yaml diff --git a/automation/vars/ovs-dpdk-sriov-2nodesets.yaml b/automation/vars/ovs-dpdk-sriov-2nodesets.yaml new file mode 100644 index 000000000..d4c08cf8c --- /dev/null +++ b/automation/vars/ovs-dpdk-sriov-2nodesets.yaml @@ -0,0 +1,60 @@ +--- +vas: + ovs-dpdk-sriov-2nodesets: + stages: + - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/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: ../../../../va/nfv/ovs-dpdk-sriov/nncp/values.yaml + build_output: nncp.yaml + + - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets + wait_conditions: + - >- + oc -n openstack wait osctlplane controlplane --for condition=Ready + --timeout=1200s + values: + - name: network-values + src_file: ../../../va/nfv/ovs-dpdk-sriov/nncp/values.yaml + - name: service-values + src_file: ../../../va/nfv/ovs-dpdk-sriov/service-values.yaml + build_output: control-plane.yaml + + - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset + wait_conditions: + - >- + oc -n openstack wait + osdpns openstack-edpm --for condition=SetupReady + --timeout=60m + values: + - name: edpm-nodeset-values + src_file: ../../../../../va/nfv/ovs-dpdk-sriov/edpm/nodeset/values.yaml + build_output: nodeset.yaml + + - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset2 + wait_conditions: + - >- + oc -n openstack wait + osdpns openstack-edpm-2 --for condition=SetupReady + --timeout=60m + values: + - name: edpm-nodeset2-values + src_file: ../../../../../va/nfv/ovs-dpdk-sriov/edpm/nodeset/values.yaml + build_output: nodeset2.yaml + + - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/deployment + wait_conditions: + - >- + oc -n openstack wait + osdpns openstack-edpm --for condition=Ready + --timeout=60m + values: + - name: edpm-deployment-values + src_file: ../../../../../va/nfv/ovs-dpdk-sriov/edpm/deployment/values.yaml + build_output: deployment.yaml diff --git a/examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/deployment/.gitignore b/examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/deployment/.gitignore new file mode 100644 index 000000000..56387c5df --- /dev/null +++ b/examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/deployment/.gitignore @@ -0,0 +1 @@ +dataplane-deployment.yaml \ No newline at end of file diff --git a/examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/deployment/kustomization.yaml b/examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/deployment/kustomization.yaml new file mode 100644 index 000000000..69898b18c --- /dev/null +++ b/examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/deployment/kustomization.yaml @@ -0,0 +1,15 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../../../../va/nfv/ovs-dpdk-sriov/edpm/deployment + +patches: + - target: + kind: OpenStackDataPlaneDeployment + name: edpm-deployment + patch: | + - op: add + path: /spec/nodeSets/- + value: openstack-edpm-2 diff --git a/examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset/kustomization.yaml b/examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset/kustomization.yaml new file mode 100644 index 000000000..3cfe9c7c9 --- /dev/null +++ b/examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset/kustomization.yaml @@ -0,0 +1,6 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../../../../va/nfv/ovs-dpdk-sriov/edpm/nodeset diff --git a/examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset2/.gitignore b/examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset2/.gitignore new file mode 100644 index 000000000..7358689c2 --- /dev/null +++ b/examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset2/.gitignore @@ -0,0 +1 @@ +dataplane-nodeset-2.yaml diff --git a/examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset2/kustomization.yaml b/examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset2/kustomization.yaml new file mode 100644 index 000000000..14d7f787d --- /dev/null +++ b/examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset2/kustomization.yaml @@ -0,0 +1,53 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../../../../va/nfv/ovs-dpdk-sriov/edpm/nodeset + +patches: + - target: + kind: ConfigMap + name: sriov-nova + patch: |- + - op: replace + path: /metadata/name + value: sriov-nova-2 + - target: + kind: ConfigMap + name: ovs-dpdk-sriov-cpu-pinning-nova + patch: |- + - op: replace + path: /metadata/name + value: ovs-dpdk-sriov-cpu-pinning-nova-2 + - target: + kind: OpenStackDataPlaneService + name: nova-custom-ovsdpdksriov + patch: |- + - op: replace + path: /metadata/name + value: nova-custom-ovsdpdksriov-2 + - op: replace + path: /spec/label + value: nova-custom-ovsdpdksriov-2 + - op: replace + path: /spec/dataSources/0/configMapRef/name + value: ovs-dpdk-sriov-cpu-pinning-nova-2 + - op: replace + path: /spec/dataSources/1/configMapRef/name + value: sriov-nova-2 + - target: + kind: OpenStackDataPlaneNodeSet + name: openstack-edpm + patch: |- + - op: replace + path: /metadata/name + value: openstack-edpm-2 + - op: replace + path: /spec/baremetalSetTemplate/bmhLabelSelector/app + value: openstack-2 + - op: replace + path: /spec/services/16 + value: nova-custom-ovsdpdksriov-2 + - op: remove + path: /spec/services/8 diff --git a/examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/kustomization.yaml b/examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/kustomization.yaml new file mode 100644 index 000000000..f22362647 --- /dev/null +++ b/examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/kustomization.yaml @@ -0,0 +1,6 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../../va/nfv/ovs-dpdk-sriov diff --git a/examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/nncp/kustomization.yaml b/examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/nncp/kustomization.yaml new file mode 100644 index 000000000..a64278116 --- /dev/null +++ b/examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/nncp/kustomization.yaml @@ -0,0 +1,6 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../../../va/nfv/ovs-dpdk-sriov/nncp diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 1a13477c6..b11ae6346 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -9,6 +9,7 @@ - rhoso-architecture-validate-osasinfra - rhoso-architecture-validate-ovs-dpdk - rhoso-architecture-validate-ovs-dpdk-sriov + - rhoso-architecture-validate-ovs-dpdk-sriov-2nodesets - rhoso-architecture-validate-pidone - rhoso-architecture-validate-sriov - rhoso-architecture-validate-uni01alpha diff --git a/zuul.d/validations.yaml b/zuul.d/validations.yaml index 0d0073cb0..69734d003 100644 --- a/zuul.d/validations.yaml +++ b/zuul.d/validations.yaml @@ -91,6 +91,18 @@ parent: rhoso-architecture-base-job vars: cifmw_architecture_scenario: ovs-dpdk-sriov +- job: + files: + - examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets + - examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/deployment + - examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset + - examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset2 + - examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/nncp + - lib + name: rhoso-architecture-validate-ovs-dpdk-sriov-2nodesets + parent: rhoso-architecture-base-job + vars: + cifmw_architecture_scenario: ovs-dpdk-sriov-2nodesets - job: files: - automation/net-env/pidone.yaml