Skip to content

Commit b70912b

Browse files
gmarciangmarcian
committed
[uni02beta] Decouple master and worker nodes on uni02beta DT to allow execution of HA tests
1 parent 2eaa1ef commit b70912b

File tree

6 files changed

+523
-7
lines changed

6 files changed

+523
-7
lines changed

‎automation/net-env/uni02beta.yaml‎

Lines changed: 173 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ instances:
387387
storage:
388388
interface_name: enp6s0.121
389389
ip_v4: 172.18.0.13
390-
mac_addr: "52:54:00:23:e0:fg"
390+
mac_addr: "52:54:00:23:e0:10"
391391
mtu: 1500
392392
netmask_v4: 255.255.255.0
393393
network_name: storage
@@ -406,6 +406,178 @@ instances:
406406
prefix_length_v4: 24
407407
skip_nm: false
408408
vlan_id: 122
409+
ocp-4:
410+
hostname: osasinfra-worker-1
411+
name: ocp-4
412+
networks:
413+
ctlplane:
414+
interface_name: enp6s0
415+
ip_v4: 192.168.122.14
416+
mac_addr: "52:54:00:de:3d:97"
417+
mtu: 1500
418+
netmask_v4: 255.255.255.0
419+
network_name: ctlplane
420+
prefix_length_v4: 24
421+
skip_nm: false
422+
internalapi:
423+
interface_name: enp6s0.120
424+
ip_v4: 172.17.0.14
425+
mac_addr: "52:54:00:63:20:1e"
426+
mtu: 1500
427+
netmask_v4: 255.255.255.0
428+
network_name: internalapi
429+
parent_interface: enp6s0
430+
prefix_length_v4: 24
431+
skip_nm: false
432+
vlan_id: 120
433+
octavia:
434+
interface_name: enp6s0.124
435+
ip_v4: 172.23.0.14
436+
mac_addr: "52:54:00:1e:24:18"
437+
mtu: 1500
438+
netmask_v4: 255.255.255.0
439+
network_name: octavia
440+
parent_interface: enp6s0
441+
prefix_length_v4: 24
442+
skip_nm: false
443+
vlan_id: 124
444+
storage:
445+
interface_name: enp6s0.121
446+
ip_v4: 172.18.0.14
447+
mac_addr: "52:54:00:23:e0:11"
448+
mtu: 1500
449+
netmask_v4: 255.255.255.0
450+
network_name: storage
451+
parent_interface: enp6s0
452+
prefix_length_v4: 24
453+
skip_nm: false
454+
vlan_id: 121
455+
tenant:
456+
interface_name: enp6s0.122
457+
ip_v4: 172.19.0.14
458+
mac_addr: "52:54:00:29:56:12"
459+
mtu: 1500
460+
netmask_v4: 255.255.255.0
461+
network_name: tenant
462+
parent_interface: enp6s0
463+
prefix_length_v4: 24
464+
skip_nm: false
465+
vlan_id: 122
466+
ocp-5:
467+
hostname: osasinfra-worker-2
468+
name: ocp-5
469+
networks:
470+
ctlplane:
471+
interface_name: enp6s0
472+
ip_v4: 192.168.122.15
473+
mac_addr: "52:54:00:de:3d:98"
474+
mtu: 1500
475+
netmask_v4: 255.255.255.0
476+
network_name: ctlplane
477+
prefix_length_v4: 24
478+
skip_nm: false
479+
internalapi:
480+
interface_name: enp6s0.120
481+
ip_v4: 172.17.0.15
482+
mac_addr: "52:54:00:63:20:1f"
483+
mtu: 1500
484+
netmask_v4: 255.255.255.0
485+
network_name: internalapi
486+
parent_interface: enp6s0
487+
prefix_length_v4: 24
488+
skip_nm: false
489+
vlan_id: 120
490+
octavia:
491+
interface_name: enp6s0.124
492+
ip_v4: 172.23.0.15
493+
mac_addr: "52:54:00:1e:24:19"
494+
mtu: 1500
495+
netmask_v4: 255.255.255.0
496+
network_name: octavia
497+
parent_interface: enp6s0
498+
prefix_length_v4: 24
499+
skip_nm: false
500+
vlan_id: 124
501+
storage:
502+
interface_name: enp6s0.121
503+
ip_v4: 172.18.0.15
504+
mac_addr: "52:54:00:23:e0:12"
505+
mtu: 1500
506+
netmask_v4: 255.255.255.0
507+
network_name: storage
508+
parent_interface: enp6s0
509+
prefix_length_v4: 24
510+
skip_nm: false
511+
vlan_id: 121
512+
tenant:
513+
interface_name: enp6s0.122
514+
ip_v4: 172.19.0.15
515+
mac_addr: "52:54:00:29:56:13"
516+
mtu: 1500
517+
netmask_v4: 255.255.255.0
518+
network_name: tenant
519+
parent_interface: enp6s0
520+
prefix_length_v4: 24
521+
skip_nm: false
522+
vlan_id: 122
523+
ocp-6:
524+
hostname: osasinfra-worker-3
525+
name: ocp-6
526+
networks:
527+
ctlplane:
528+
interface_name: enp6s0
529+
ip_v4: 192.168.122.16
530+
mac_addr: "52:54:00:de:3d:99"
531+
mtu: 1500
532+
netmask_v4: 255.255.255.0
533+
network_name: ctlplane
534+
prefix_length_v4: 24
535+
skip_nm: false
536+
internalapi:
537+
interface_name: enp6s0.120
538+
ip_v4: 172.17.0.16
539+
mac_addr: "52:54:00:63:20:20"
540+
mtu: 1500
541+
netmask_v4: 255.255.255.0
542+
network_name: internalapi
543+
parent_interface: enp6s0
544+
prefix_length_v4: 24
545+
skip_nm: false
546+
vlan_id: 120
547+
octavia:
548+
interface_name: enp6s0.124
549+
ip_v4: 172.23.0.16
550+
mac_addr: "52:54:00:1e:24:1a"
551+
mtu: 1500
552+
netmask_v4: 255.255.255.0
553+
network_name: octavia
554+
parent_interface: enp6s0
555+
prefix_length_v4: 24
556+
skip_nm: false
557+
vlan_id: 124
558+
storage:
559+
interface_name: enp6s0.121
560+
ip_v4: 172.18.0.16
561+
# Intentionally fake/non-hex MAC (matches existing repo convention); worker-3 is dedicated to test-operator
562+
mac_addr: "52:54:00:23:e0:fg"
563+
mtu: 1500
564+
netmask_v4: 255.255.255.0
565+
network_name: storage
566+
parent_interface: enp6s0
567+
prefix_length_v4: 24
568+
skip_nm: false
569+
vlan_id: 121
570+
tenant:
571+
interface_name: enp6s0.122
572+
ip_v4: 172.19.0.16
573+
mac_addr: "52:54:00:29:56:14"
574+
mtu: 1500
575+
netmask_v4: 255.255.255.0
576+
network_name: tenant
577+
parent_interface: enp6s0
578+
prefix_length_v4: 24
579+
skip_nm: false
580+
vlan_id: 122
409581
networker-0:
410582
hostname: networker-0
411583
name: networker-0

‎automation/vars/uni02beta.yaml‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,22 @@
22
vas:
33
uni02beta:
44
stages:
5-
- name: nncp-configuration
5+
- pre_stage_run:
6+
- name: Apply taint on worker-3 (Test Operator node)
7+
type: cr
8+
definition:
9+
spec:
10+
taints:
11+
- effect: NoSchedule
12+
key: testOperator
13+
value: 'true'
14+
- effect: NoExecute
15+
key: testOperator
16+
value: 'true'
17+
kind: Node
18+
resource_name: worker-3
19+
state: patched
20+
name: nncp-configuration
621
path: examples/dt/uni02beta/control-plane/networking/nncp
722
wait_conditions:
823
- >-

‎examples/dt/uni02beta/README.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@
66
Focused on components with NFS-based backends.
77

88
## Node topology
9-
| Node role | Machine Type | Count |
10-
| ----------------- | ------------ | ----- |
11-
| Compact OpenShift | vm | 3 |
12-
| Compute nodes | vm | 2 |
9+
| Node role | Machine Type | Count |
10+
| ----------------------------------------- | ------------ | ----- |
11+
| OpenShift masters (dedicated to OpenShift) | vm | 3 |
12+
| OpenShift workers (OpenStack control plane)| vm | 3 |
13+
| OpenShift worker (Test Operator) | vm | 1 |
14+
| Compute nodes | vm | 2 |
1315

1416

1517
## Services, enabled features and configurations

0 commit comments

Comments
 (0)