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/examples/dt/nova/multiplecells/edpm/nodeset/values.yaml b/examples/dt/nova/multiplecells/edpm/nodeset/values.yaml index 456246af3..cc3d672e4 100644 --- a/examples/dt/nova/multiplecells/edpm/nodeset/values.yaml +++ b/examples/dt/nova/multiplecells/edpm/nodeset/values.yaml @@ -103,22 +103,6 @@ data: - name: tenant subnetName: subnet1 - edpm-compute-1: - ansible: - ansibleHost: 192.168.122.101 - hostName: edpm-compute-1 - networks: - - defaultRoute: true - fixedIP: 192.168.122.101 - name: ctlplane - subnetName: subnet1 - - name: internalapi - subnetName: subnet1 - - name: storage - subnetName: subnet1 - - name: tenant - subnetName: subnet1 - services: - bootstrap - download-cache diff --git a/examples/dt/nova/multiplecells/edpm/nodeset2/values.yaml b/examples/dt/nova/multiplecells/edpm/nodeset2/values.yaml index 3b33294e6..9278f7ebe 100644 --- a/examples/dt/nova/multiplecells/edpm/nodeset2/values.yaml +++ b/examples/dt/nova/multiplecells/edpm/nodeset2/values.yaml @@ -87,29 +87,13 @@ data: subnetName: subnet1 nodes: - edpm-compute-2: + edpm-compute-1: ansible: - ansibleHost: 192.168.122.102 - hostName: edpm-compute-2 + ansibleHost: 192.168.122.101 + hostName: edpm-compute-1 networks: - defaultRoute: true - fixedIP: 192.168.122.102 - name: ctlplane - subnetName: subnet1 - - name: internalapi - subnetName: subnet1 - - name: storage - subnetName: subnet1 - - name: tenant - subnetName: subnet1 - - edpm-compute-3: - ansible: - ansibleHost: 192.168.122.103 - hostName: edpm-compute-3 - networks: - - defaultRoute: true - fixedIP: 192.168.122.103 + fixedIP: 192.168.122.101 name: ctlplane subnetName: subnet1 - name: internalapi 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