Skip to content

Commit f4f19f6

Browse files
mnietojimnietoji
committed
[NFV] OVS DPDK SRIOV IPV6 with 1 or 2 nodesets scenarios
Created 2 new scenarios adding ipv6 to 2 already existing scenarios: * VA OVS DPDK SRIOV * DT OVS DPDK SRIOV with 2 nodesets Signed-off-by: Miguel Angel Nieto Jimenez <mnietoji@redhat.com>
1 parent 851e915 commit f4f19f6

23 files changed

+1073
-0
lines changed

‎automation/mocks/ovs-dpdk-sriov-ipv6-2nodesets.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ovs-dpdk-sriov.yaml

‎automation/mocks/ovs-dpdk-sriov-ipv6.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ovs-dpdk-sriov.yaml

‎automation/mocks/ovs-dpdk-sriov.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ cifmw_baremetal_hosts:
33
compute-0:
44
connection: ipmi://10.10.100.100
55
boot_mode: UEFI
6+
label: openstack
67
nics:
78
- mac: "89:9a:b7:cb:4a:3f"
89
network: provision
@@ -12,6 +13,7 @@ cifmw_baremetal_hosts:
1213
compute-1:
1314
connection: ipmi://10.10.100.101
1415
boot_mode: UEFI
16+
label: openstack-2
1517
nics:
1618
- mac: "53:b0:4d:06:56:ea"
1719
network: provision

‎automation/vars/ovs-dpdk-sriov-ipv6-2nodesets.yaml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
---
2+
vas:
3+
ovs-dpdk-sriov-ipv6-2nodesets:
4+
stages:
5+
- name: nncp-configuration
6+
path: examples/dt/nfv/nfv-ovs-dpdk-sriov-ipv6-2nodesets/nncp
7+
wait_conditions:
8+
- >-
9+
oc -n openstack wait nncp
10+
-l osp/nncm-config-type=standard
11+
--for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured
12+
--timeout=60s
13+
values:
14+
- name: network-values
15+
src_file: values.yaml
16+
build_output: nncp.yaml
17+
18+
- name: control-plane
19+
path: examples/dt/nfv/nfv-ovs-dpdk-sriov-ipv6-2nodesets
20+
wait_conditions:
21+
- >-
22+
oc -n openstack wait osctlplane controlplane --for condition=Ready
23+
--timeout=1200s
24+
values:
25+
- name: network-values
26+
src_file: ./nncp/values.yaml
27+
- name: service-values
28+
src_file: service-values.yaml
29+
build_output: control-plane.yaml
30+
31+
- name: edpm-nodeset
32+
path: examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset
33+
wait_conditions:
34+
- >-
35+
oc -n openstack wait
36+
osdpns openstack-edpm --for condition=SetupReady
37+
--timeout=90m
38+
values:
39+
- name: edpm-nodeset-values
40+
src_file: values.yaml
41+
build_output: nodeset.yaml
42+
43+
- name: edpm-nodeset2
44+
path: examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset2
45+
wait_conditions:
46+
- >-
47+
oc -n openstack wait
48+
osdpns openstack-edpm-2 --for condition=SetupReady
49+
--timeout=90m
50+
values:
51+
- name: edpm-nodeset2-values
52+
src_file: values.yaml
53+
build_output: nodeset2.yaml
54+
55+
- name: edpm-deployment
56+
path: examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/deployment
57+
wait_conditions:
58+
- >-
59+
oc -n openstack
60+
wait openstackdataplanedeployments.dataplane.openstack.org
61+
edpm-deployment
62+
--for condition=Ready --timeout=60m
63+
values:
64+
- name: edpm-deployment-values
65+
src_file: values.yaml
66+
build_output: deployment.yaml

‎automation/vars/ovs-dpdk-sriov-ipv6.yaml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
---
2+
vas:
3+
ovs-dpdk-sriov-ipv6:
4+
stages:
5+
- name: nncp-configuration
6+
path: examples/va/nfv/ovs-dpdk-sriov-ipv6/nncp
7+
wait_conditions:
8+
- >-
9+
oc -n openstack wait nncp
10+
-l osp/nncm-config-type=standard
11+
--for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured
12+
--timeout=60s
13+
values:
14+
- name: network-values
15+
src_file: values.yaml
16+
build_output: nncp.yaml
17+
18+
- name: control-plane
19+
path: examples/va/nfv/ovs-dpdk-sriov-ipv6
20+
wait_conditions:
21+
- >-
22+
oc -n openstack wait osctlplane controlplane --for condition=Ready
23+
--timeout=1200s
24+
values:
25+
- name: network-values
26+
src_file: nncp/values.yaml
27+
- name: service-values
28+
src_file: service-values.yaml
29+
build_output: control-plane.yaml
30+
31+
- name: edpm-nodeset
32+
path: examples/va/nfv/ovs-dpdk-sriov/edpm/nodeset
33+
wait_conditions:
34+
- >-
35+
oc -n openstack wait
36+
osdpns openstack-edpm --for condition=SetupReady
37+
--timeout=90m
38+
values:
39+
- name: edpm-nodeset-values
40+
src_file: values.yaml
41+
build_output: nodeset.yaml
42+
43+
- name: edpm-deployment
44+
path: examples/va/nfv/ovs-dpdk-sriov/edpm/deployment
45+
wait_conditions:
46+
- >-
47+
oc -n openstack wait
48+
osdpns openstack-edpm --for condition=Ready
49+
--timeout=60m
50+
values:
51+
- name: edpm-deployment-values
52+
src_file: values.yaml
53+
build_output: deployment.yaml

‎examples/dt/nfv/nfv-ovs-dpdk-sriov-ipv6-2nodesets/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
nncp.yaml
2+
control-plane.yaml

‎examples/dt/nfv/nfv-ovs-dpdk-sriov-ipv6-2nodesets/README.md‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Deployed Topology - NFV/OVS-DPDK-SRIOV with IPv6 and 2 nodesets
2+
3+
Deploys an OVS-DPDK-SRIOV environment with IPv6 as the primary IP stack and 2 different nodesets.
4+
It is an extension of the regular OVS-DPDK-SRIOV scenario, so all information in that scenario is
5+
valid here too. Check [OpenStack OVS DPDK SRIOV](../../../va/nfv/ovs-dpdk-sriov/README.md)
6+
7+
## Purpose
8+
9+
This scenario is needed when compute nodes used to deploy OpenStack dataplane
10+
are different (different nics, cpu, memory, ...) so a different nodeset can
11+
be created for each different compute node.
12+
13+
This DT is based on OVS-DPDK-SRIOV VA with two key additions:
14+
- IPv6 networking: All control plane and data plane networks use IPv6 addresses (2620:cf:cf:XXXX::/64 subnets)
15+
- Multiple nodesets: Configures 2 separate nodesets to support heterogeneous compute nodes
16+
17+
## Stages
18+
19+
All stages must be executed in the order listed below. Everything is required unless otherwise indicated.
20+
Stages are the same than the OVS-DPDK-SRIOV scenario, the only difference is that it will
21+
be created 2 nodesets instead of just 1
22+
23+
1. [Install the OpenStack K8S operators and their dependencies](../../../common/)
24+
2. [Configuring networking and deploy the OpenStack control plane](control-plane.md)
25+
3. [Configure and deploy the data plane](dataplane.md)
26+
27+

‎examples/dt/nfv/nfv-ovs-dpdk-sriov-ipv6-2nodesets/control-plane.md‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# Configuring networking and deploy the OpenStack control plane
2+
3+
## Assumptions
4+
5+
- A storage class called `local-storage` should already exist.
6+
7+
## Initialize
8+
9+
Switch to the "openstack" namespace
10+
```
11+
oc project openstack
12+
```
13+
Change to the nfv/nfv-ovs-dpdk-sriov-ipv6-2nodesets directory
14+
```
15+
cd examples/dt/nfv/nfv-ovs-dpdk-sriov-ipv6-2nodesets
16+
```
17+
Edit the [nncp/values.yaml](nncp/values.yaml) and
18+
[service-values.yaml](service-values.yaml) files to suit
19+
your environment.
20+
```
21+
vi nncp/values.yaml
22+
vi service-values.yaml
23+
```
24+
25+
## Apply node network configuration
26+
27+
Generate the node network configuration
28+
```
29+
kustomize build nncp > nncp.yaml
30+
```
31+
32+
Apply the NNCP CRs
33+
```
34+
oc apply -f nncp.yaml
35+
```
36+
Wait for NNCPs to be available
37+
```
38+
oc wait nncp -l osp/nncm-config-type=standard --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured --timeout=300s
39+
```
40+
41+
## Apply networking and control-plane configuration
42+
43+
Generate the control-plane and networking CRs.
44+
```
45+
kustomize build > control-plane.yaml
46+
```
47+
Apply the CRs
48+
```
49+
oc apply -f control-plane.yaml
50+
```
51+
52+
Wait for control plane to be available
53+
```
54+
oc wait osctlplane controlplane --for condition=Ready --timeout=600s
55+
```

‎examples/dt/nfv/nfv-ovs-dpdk-sriov-ipv6-2nodesets/dataplane.md‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
# Configuring and deploying the dataplane
2+
3+
## Assumptions
4+
5+
- The [control plane](control-plane.md) has been created and successfully deployed
6+
7+
## Initialize
8+
9+
Switch to the "openstack" namespace
10+
```
11+
oc project openstack
12+
```
13+
Change to the nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm directory
14+
15+
> **Note**: The IPv6 2-nodesets scenario reuses the dataplane configuration from the standard
16+
> nfv-ovs-dpdk-sriov-2nodesets scenario, as there are no differences in the EDPM configuration
17+
> between IPv4 and IPv6 deployments. The IPv6 networking is configured at the
18+
> control plane level (NNCP and service values).
19+
20+
```
21+
cd examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm
22+
```
23+
Edit the [nodeset/values.yaml](edpm/nodeset/values.yaml), [nodeset2/values.yaml](edpm/nodeset2/values.yaml)
24+
and [deployment/values.yaml](deployment/values.yaml) files to suit your environment.
25+
```
26+
vi nodeset/values.yaml
27+
vi nodeset2/values.yaml
28+
vi deployment/values.yaml
29+
```
30+
Generate the dataplane nodesets CRs.
31+
```
32+
kustomize build nodeset > dataplane-nodeset.yaml
33+
kustomize build nodeset2 > dataplane-nodeset2.yaml
34+
```
35+
Generate the dataplane deployment CR.
36+
```
37+
kustomize build deployment > dataplane-deployment.yaml
38+
```
39+
40+
## Create CRs
41+
Create the nodesets CRs
42+
```
43+
oc apply -f dataplane-nodeset.yaml
44+
oc apply -f dataplane-nodeset2.yaml
45+
```
46+
Wait for dataplane nodesets setup to finish
47+
```
48+
oc wait osdpns openstack-edpm --for condition=SetupReady --timeout=600s
49+
oc wait osdpns openstack-edpm-2 --for condition=SetupReady --timeout=600s
50+
```
51+
52+
Start the deployment
53+
```
54+
oc apply -f dataplane-deployment.yaml
55+
```
56+
57+
Wait for dataplane deployment to finish
58+
```
59+
oc wait osdpns openstack-edpm --for condition=Ready --timeout=40m
60+
```

‎examples/dt/nfv/nfv-ovs-dpdk-sriov-ipv6-2nodesets/kustomization.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
apiVersion: kustomize.config.k8s.io/v1beta1
3+
kind: Kustomization
4+
5+
components:
6+
- ../../../../va/nfv/ovs-dpdk-sriov/
7+
# - https://github.com/openstack-k8s-operators/architecture/va/nfv/ovs-dpdk-sriov?ref=main
8+
## It's possible to replace ../../../../va/nfv/ovs-dpdk-sriov/ with a git checkout URL as per:
9+
## https://github.com/kubernetes-sigs/kustomize/blob/master/examples/remoteBuild.md
10+
11+
resources:
12+
- nncp/values.yaml
13+
- service-values.yaml

0 commit comments

Comments
 (0)