Skip to content

Commit 3e24928

Browse files
eduolivareseduolivares
committed
Reduce number of workers
Signed-off-by: Eduardo Olivares <[email protected]>
1 parent dc2e94b commit 3e24928

File tree

9 files changed

+45
-971
lines changed

9 files changed

+45
-971
lines changed

‎automation/mocks/bgp-l3-xl.yaml‎

Lines changed: 12 additions & 189 deletions
Original file line numberDiff line numberDiff line change
@@ -683,63 +683,6 @@ cifmw_networking_env_definition:
683683
ocp-worker-2:
684684
hostname: worker-2
685685
name: ocp-worker-2
686-
networks:
687-
ctlplane:
688-
interface_name: enp8s0
689-
ip_v4: 192.168.122.15
690-
mac_addr: 52:54:00:a3:32:7a
691-
mtu: 1500
692-
netmask_v4: 255.255.255.0
693-
network_name: ctlplane
694-
prefix_length_v4: 24
695-
skip_nm: false
696-
internalapi:
697-
interface_name: enp8s0.20
698-
ip_v4: 172.17.0.15
699-
mac_addr: 52:54:00:2a:55:0f
700-
mtu: 1500
701-
netmask_v4: 255.255.255.0
702-
network_name: internalapi
703-
parent_interface: enp8s0
704-
prefix_length_v4: 24
705-
skip_nm: false
706-
vlan_id: 20
707-
octavia:
708-
interface_name: enp8s0.23
709-
ip_v4: 172.23.0.15
710-
mac_addr: 52:54:00:13:4e:27
711-
mtu: 1500
712-
netmask_v4: 255.255.255.0
713-
network_name: octavia
714-
parent_interface: enp8s0
715-
prefix_length_v4: 24
716-
skip_nm: false
717-
vlan_id: 23
718-
storage:
719-
interface_name: enp8s0.21
720-
ip_v4: 172.18.0.15
721-
mac_addr: 52:54:00:12:6e:dc
722-
mtu: 1500
723-
netmask_v4: 255.255.255.0
724-
network_name: storage
725-
parent_interface: enp8s0
726-
prefix_length_v4: 24
727-
skip_nm: false
728-
vlan_id: 21
729-
tenant:
730-
interface_name: enp8s0.22
731-
ip_v4: 172.19.0.15
732-
mac_addr: 52:54:00:18:2f:ac
733-
mtu: 1500
734-
netmask_v4: 255.255.255.0
735-
network_name: tenant
736-
parent_interface: enp8s0
737-
prefix_length_v4: 24
738-
skip_nm: false
739-
vlan_id: 22
740-
ocp-worker-3:
741-
hostname: worker-3
742-
name: ocp-worker-3
743686
networks:
744687
ctlplane:
745688
interface_name: enp7s0
@@ -794,9 +737,9 @@ cifmw_networking_env_definition:
794737
prefix_length_v4: 24
795738
skip_nm: false
796739
vlan_id: 22
797-
ocp-worker-4:
798-
hostname: worker-4
799-
name: ocp-worker-4
740+
ocp-worker-3:
741+
hostname: worker-3
742+
name: ocp-worker-3
800743
networks:
801744
ctlplane:
802745
interface_name: enp7s0
@@ -851,66 +794,9 @@ cifmw_networking_env_definition:
851794
prefix_length_v4: 24
852795
skip_nm: false
853796
vlan_id: 22
854-
ocp-worker-5:
855-
hostname: worker-5
856-
name: ocp-worker-5
857-
networks:
858-
ctlplane:
859-
interface_name: enp7s0
860-
ip_v4: 192.168.122.18
861-
mac_addr: 52:54:00:67:1b:c5
862-
mtu: 1500
863-
netmask_v4: 255.255.255.0
864-
network_name: ctlplane
865-
prefix_length_v4: 24
866-
skip_nm: false
867-
internalapi:
868-
interface_name: enp7s0.20
869-
ip_v4: 172.17.0.18
870-
mac_addr: 52:54:00:65:17:db
871-
mtu: 1500
872-
netmask_v4: 255.255.255.0
873-
network_name: internalapi
874-
parent_interface: enp7s0
875-
prefix_length_v4: 24
876-
skip_nm: false
877-
vlan_id: 20
878-
octavia:
879-
interface_name: enp7s0.23
880-
ip_v4: 172.23.0.18
881-
mac_addr: 52:54:00:2f:28:7e
882-
mtu: 1500
883-
netmask_v4: 255.255.255.0
884-
network_name: octavia
885-
parent_interface: enp7s0
886-
prefix_length_v4: 24
887-
skip_nm: false
888-
vlan_id: 23
889-
storage:
890-
interface_name: enp7s0.21
891-
ip_v4: 172.18.0.18
892-
mac_addr: 52:54:00:46:68:6b
893-
mtu: 1500
894-
netmask_v4: 255.255.255.0
895-
network_name: storage
896-
parent_interface: enp7s0
897-
prefix_length_v4: 24
898-
skip_nm: false
899-
vlan_id: 21
900-
tenant:
901-
interface_name: enp7s0.22
902-
ip_v4: 172.19.0.18
903-
mac_addr: 52:54:00:31:3b:02
904-
mtu: 1500
905-
netmask_v4: 255.255.255.0
906-
network_name: tenant
907-
parent_interface: enp7s0
908-
prefix_length_v4: 24
909-
skip_nm: false
910-
vlan_id: 22
911-
ocp-worker-6:
912-
hostname: worker-6
913-
name: ocp-worker-6
797+
ocp-worker-4:
798+
hostname: worker-4
799+
name: ocp-worker-4
914800
networks:
915801
ctlplane:
916802
interface_name: enp7s0
@@ -965,9 +851,9 @@ cifmw_networking_env_definition:
965851
prefix_length_v4: 24
966852
skip_nm: false
967853
vlan_id: 22
968-
ocp-worker-7:
969-
hostname: worker-7
970-
name: ocp-worker-7
854+
ocp-worker-5:
855+
hostname: worker-5
856+
name: ocp-worker-5
971857
networks:
972858
ctlplane:
973859
interface_name: enp7s0
@@ -1022,66 +908,9 @@ cifmw_networking_env_definition:
1022908
prefix_length_v4: 24
1023909
skip_nm: false
1024910
vlan_id: 22
1025-
ocp-worker-8:
1026-
hostname: worker-8
1027-
name: ocp-worker-8
1028-
networks:
1029-
ctlplane:
1030-
interface_name: enp7s0
1031-
ip_v4: 192.168.122.21
1032-
mac_addr: 52:54:00:67:1b:c5
1033-
mtu: 1500
1034-
netmask_v4: 255.255.255.0
1035-
network_name: ctlplane
1036-
prefix_length_v4: 24
1037-
skip_nm: false
1038-
internalapi:
1039-
interface_name: enp7s0.20
1040-
ip_v4: 172.17.0.21
1041-
mac_addr: 52:54:00:65:17:db
1042-
mtu: 1500
1043-
netmask_v4: 255.255.255.0
1044-
network_name: internalapi
1045-
parent_interface: enp7s0
1046-
prefix_length_v4: 24
1047-
skip_nm: false
1048-
vlan_id: 20
1049-
octavia:
1050-
interface_name: enp7s0.23
1051-
ip_v4: 172.23.0.21
1052-
mac_addr: 52:54:00:2f:28:7e
1053-
mtu: 1500
1054-
netmask_v4: 255.255.255.0
1055-
network_name: octavia
1056-
parent_interface: enp7s0
1057-
prefix_length_v4: 24
1058-
skip_nm: false
1059-
vlan_id: 23
1060-
storage:
1061-
interface_name: enp7s0.21
1062-
ip_v4: 172.18.0.21
1063-
mac_addr: 52:54:00:46:68:6b
1064-
mtu: 1500
1065-
netmask_v4: 255.255.255.0
1066-
network_name: storage
1067-
parent_interface: enp7s0
1068-
prefix_length_v4: 24
1069-
skip_nm: false
1070-
vlan_id: 21
1071-
tenant:
1072-
interface_name: enp7s0.22
1073-
ip_v4: 172.19.0.21
1074-
mac_addr: 52:54:00:31:3b:02
1075-
mtu: 1500
1076-
netmask_v4: 255.255.255.0
1077-
network_name: tenant
1078-
parent_interface: enp7s0
1079-
prefix_length_v4: 24
1080-
skip_nm: false
1081-
vlan_id: 22
1082-
ocp-worker-9:
1083-
hostname: worker-9
1084-
name: ocp-worker-9
911+
ocp-worker-6:
912+
hostname: worker-6
913+
name: ocp-worker-6
1085914
networks:
1086915
ctlplane:
1087916
interface_name: enp7s0
@@ -1458,9 +1287,6 @@ test_groups:
14581287
- ocp-worker-4
14591288
- ocp-worker-5
14601289
- ocp-worker-6
1461-
- ocp-worker-7
1462-
- ocp-worker-8
1463-
- ocp-worker-9
14641290
- router-0
14651291
- spine-0
14661292
- spine-1
@@ -1493,9 +1319,6 @@ test_groups:
14931319
- ocp-worker-4
14941320
- ocp-worker-5
14951321
- ocp-worker-6
1496-
- ocp-worker-7
1497-
- ocp-worker-8
1498-
- ocp-worker-9
14991322
ocps:
15001323
- ocp-master-0
15011324
- ocp-master-1

‎automation/vars/bgp-l3-xl-adoption.yaml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ vas:
33
bgp-l3-xl-adoption:
44
stages:
55
- pre_stage_run:
6-
- name: Apply taint on worker-9
6+
- name: Apply taint on worker-6
77
type: cr
88
definition:
99
spec:
@@ -15,7 +15,7 @@ vas:
1515
key: testOperator
1616
value: 'true'
1717
kind: Node
18-
resource_name: worker-9
18+
resource_name: worker-6
1919
state: patched
2020
- name: Disable rp_filters on OCP nodes
2121
type: cr
@@ -46,12 +46,6 @@ vas:
4646
value: worker-4
4747
- label: kubernetes.io/hostname
4848
value: worker-5
49-
- label: kubernetes.io/hostname
50-
value: worker-6
51-
- label: kubernetes.io/hostname
52-
value: worker-7
53-
- label: kubernetes.io/hostname
54-
value: worker-8
5549
- label: node-role.kubernetes.io/master
5650
operand:
5751
tunedConfig:

‎automation/vars/bgp-l3-xl.yaml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ vas:
33
bgp-l3-xl:
44
stages:
55
- pre_stage_run:
6-
- name: Apply taint on worker-9
6+
- name: Apply taint on worker-6
77
type: cr
88
definition:
99
spec:
@@ -15,7 +15,7 @@ vas:
1515
key: testOperator
1616
value: 'true'
1717
kind: Node
18-
resource_name: worker-9
18+
resource_name: worker-6
1919
state: patched
2020
- name: Disable rp_filters on OCP nodes
2121
type: cr
@@ -46,12 +46,6 @@ vas:
4646
value: worker-4
4747
- label: kubernetes.io/hostname
4848
value: worker-5
49-
- label: kubernetes.io/hostname
50-
value: worker-6
51-
- label: kubernetes.io/hostname
52-
value: worker-7
53-
- label: kubernetes.io/hostname
54-
value: worker-8
5549
- label: node-role.kubernetes.io/master
5650
operand:
5751
tunedConfig:

0 commit comments

Comments
 (0)