Skip to content

Commit af05132

Browse files
eduolivareseduolivares
committed
remove an ocp node per rack
1 parent 807100f commit af05132

File tree

5 files changed

+23
-66
lines changed

5 files changed

+23
-66
lines changed

‎roles/adoption_osp_deploy/tasks/prepare_overcloud.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -253,20 +253,20 @@
253253
main6: 'f00d:f00d:f00d:f00d:f00d:f00d:f00d:0009'
254254
osp-r0-controller-0:
255255
ctlplane: '192.168.122.140'
256-
left: '100.64.0.30'
257-
right: '100.65.0.30'
256+
left: '100.64.0.26'
257+
right: '100.65.0.26'
258258
main: '99.99.0.29'
259259
main6: 'f00d:f00d:f00d:f00d:f00d:f00d:f00d:0001'
260260
osp-r1-controller-0:
261261
ctlplane: '192.168.123.142'
262-
left: '100.64.1.30'
263-
right: '100.65.1.30'
262+
left: '100.64.1.26'
263+
right: '100.65.1.26'
264264
main: '99.99.1.29'
265265
main6: 'f00d:f00d:f00d:f00d:f00d:f00d:f00d:0002'
266266
osp-r2-controller-0:
267267
ctlplane: '192.168.124.144'
268-
left: '100.64.2.30'
269-
right: '100.65.2.30'
268+
left: '100.64.2.26'
269+
right: '100.65.2.26'
270270
main: '99.99.2.29'
271271
main6: 'f00d:f00d:f00d:f00d:f00d:f00d:f00d:0003'
272272
ansible.builtin.template:

‎roles/adoption_osp_deploy/templates/os_net_config_overcloud_bgp.yml.j2‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ network_config:
1414
next_hop: 192.168.111.1
1515
- ip_netmask: 212.0.0.0/8
1616
next_hop: 192.168.111.1
17+
- ip_netmask: 96.0.0.0/8
18+
next_hop: 192.168.111.1
19+
- ip_netmask: 2.0.0.0/8
20+
next_hop: 192.168.111.1
1721
{% for _ip in _ips_for_oc_routes_list %}
1822
- ip_netmask: {{ _ip }}/32
1923
next_hop: 192.168.111.1

‎roles/adoption_osp_deploy/templates/os_net_config_undercloud_bgp.yml.j2‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ network_config:
2525
next_hop: 192.168.111.1
2626
- ip_netmask: 212.0.0.0/8
2727
next_hop: 192.168.111.1
28+
- ip_netmask: 96.0.0.0/8
29+
next_hop: 192.168.111.1
30+
- ip_netmask: 2.0.0.0/8
31+
next_hop: 192.168.111.1
2832
{% for _ip in _ips_for_uc_routes_list %}
2933
- ip_netmask: {{ _ip }}/32
3034
next_hop: 192.168.111.1
@@ -60,13 +64,13 @@ network_config:
6064
use_dhcp: false
6165
addresses:
6266
- ip_netmask:
63-
100.64.0.34/30
67+
100.64.0.30/30
6468
- type: interface
6569
name: nic4
6670
use_dhcp: false
6771
addresses:
6872
- ip_netmask:
69-
100.65.0.34/30
73+
100.65.0.30/30
7074
- type: interface
7175
name: lo
7276
use_dhcp: false

‎scenarios/adoption/bgp-l3-xl.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@ libvirt_manager_patch_layout:
210210
- "l00-ocp0"
211211
- "l00-ocp1"
212212
- "l00-ocp2"
213-
- "l00-ocp3"
214213
- "l00-node3"
215214
- "l00-node4"
216215
- # rack0 - leaf01
@@ -222,7 +221,6 @@ libvirt_manager_patch_layout:
222221
- "l01-ocp0"
223222
- "l01-ocp1"
224223
- "l01-ocp2"
225-
- "l01-ocp3"
226224
- "l01-node3"
227225
- "l01-node4"
228226
- # rack1 - leaf10
@@ -234,7 +232,6 @@ libvirt_manager_patch_layout:
234232
- "l10-ocp0"
235233
- "l10-ocp1"
236234
- "l10-ocp2"
237-
- "l10-ocp3"
238235
- "l10-node3"
239236
- "l10-node4"
240237
- # rack1 - leaf11
@@ -246,7 +243,6 @@ libvirt_manager_patch_layout:
246243
- "l11-ocp0"
247244
- "l11-ocp1"
248245
- "l11-ocp2"
249-
- "l11-ocp3"
250246
- "l11-node3"
251247
- "l11-node4"
252248
- # rack2 - leaf20
@@ -258,7 +254,6 @@ libvirt_manager_patch_layout:
258254
- "l20-ocp0"
259255
- "l20-ocp1"
260256
- "l20-ocp2"
261-
- "l20-ocp3"
262257
- "l20-node3"
263258
- "l20-node4"
264259
- # rack2 - leaf21
@@ -270,7 +265,6 @@ libvirt_manager_patch_layout:
270265
- "l21-ocp0"
271266
- "l21-ocp1"
272267
- "l21-ocp2"
273-
- "l21-ocp3"
274268
- "l21-node3"
275269
- "l21-node4"
276270

‎scenarios/reproducers/bgp-l3-xl.yml‎

Lines changed: 7 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ cifmw_libvirt_manager_network_interface_types:
5252
l00-ocp0: network
5353
l00-ocp1: network
5454
l00-ocp2: network
55-
l00-ocp3: network
5655
l01-node0: network
5756
l01-node1: network
5857
l01-node2: network
@@ -61,7 +60,6 @@ cifmw_libvirt_manager_network_interface_types:
6160
l01-ocp0: network
6261
l01-ocp1: network
6362
l01-ocp2: network
64-
l01-ocp3: network
6563
l10-node0: network
6664
l10-node1: network
6765
l10-node2: network
@@ -70,7 +68,6 @@ cifmw_libvirt_manager_network_interface_types:
7068
l10-ocp0: network
7169
l10-ocp1: network
7270
l10-ocp2: network
73-
l10-ocp3: network
7471
l11-node0: network
7572
l11-node1: network
7673
l11-node2: network
@@ -79,7 +76,6 @@ cifmw_libvirt_manager_network_interface_types:
7976
l11-ocp0: network
8077
l11-ocp1: network
8178
l11-ocp2: network
82-
l11-ocp3: network
8379
l20-node0: network
8480
l20-node1: network
8581
l20-node2: network
@@ -88,7 +84,6 @@ cifmw_libvirt_manager_network_interface_types:
8884
l20-ocp0: network
8985
l20-ocp1: network
9086
l20-ocp2: network
91-
l20-ocp3: network
9287
l21-node0: network
9388
l21-node1: network
9489
l21-node2: network
@@ -97,7 +92,6 @@ cifmw_libvirt_manager_network_interface_types:
9792
l21-ocp0: network
9893
l21-ocp1: network
9994
l21-ocp2: network
100-
l21-ocp3: network
10195

10296
cifmw_libvirt_manager_configuration:
10397
networks:
@@ -236,11 +230,6 @@ cifmw_libvirt_manager_configuration:
236230
<name>l00-ocp2</name>
237231
<bridge name='l00-ocp2' stp='on' delay='0'/>
238232
</network>
239-
l00-ocp3: |
240-
<network>
241-
<name>l00-ocp3</name>
242-
<bridge name='l00-ocp3' stp='on' delay='0'/>
243-
</network>
244233
l01-node0: |
245234
<network>
246235
<name>l01-node0</name>
@@ -281,11 +270,6 @@ cifmw_libvirt_manager_configuration:
281270
<name>l01-ocp2</name>
282271
<bridge name='l01-ocp2' stp='on' delay='0'/>
283272
</network>
284-
l01-ocp3: |
285-
<network>
286-
<name>l01-ocp3</name>
287-
<bridge name='l01-ocp3' stp='on' delay='0'/>
288-
</network>
289273
## rack1
290274
l10-node0: |
291275
<network>
@@ -327,11 +311,6 @@ cifmw_libvirt_manager_configuration:
327311
<name>l10-ocp2</name>
328312
<bridge name='l10-ocp2' stp='on' delay='0'/>
329313
</network>
330-
l10-ocp3: |
331-
<network>
332-
<name>l10-ocp3</name>
333-
<bridge name='l10-ocp3' stp='on' delay='0'/>
334-
</network>
335314
l11-node0: |
336315
<network>
337316
<name>l11-node0</name>
@@ -372,11 +351,6 @@ cifmw_libvirt_manager_configuration:
372351
<name>l11-ocp2</name>
373352
<bridge name='l11-ocp2' stp='on' delay='0'/>
374353
</network>
375-
l11-ocp3: |
376-
<network>
377-
<name>l11-ocp3</name>
378-
<bridge name='l11-ocp3' stp='on' delay='0'/>
379-
</network>
380354
## rack2
381355
l20-node0: |
382356
<network>
@@ -418,11 +392,6 @@ cifmw_libvirt_manager_configuration:
418392
<name>l20-ocp2</name>
419393
<bridge name='l20-ocp2' stp='on' delay='0'/>
420394
</network>
421-
l20-ocp3: |
422-
<network>
423-
<name>l20-ocp3</name>
424-
<bridge name='l20-ocp3' stp='on' delay='0'/>
425-
</network>
426395
l21-node0: |
427396
<network>
428397
<name>l21-node0</name>
@@ -463,11 +432,6 @@ cifmw_libvirt_manager_configuration:
463432
<name>l21-ocp2</name>
464433
<bridge name='l21-ocp2' stp='on' delay='0'/>
465434
</network>
466-
l21-ocp3: |
467-
<network>
468-
<name>l21-ocp3</name>
469-
<bridge name='l21-ocp3' stp='on' delay='0'/>
470-
</network>
471435
ocpbm: |
472436
<network>
473437
<name>ocpbm</name>
@@ -695,7 +659,7 @@ cifmw_libvirt_manager_configuration:
695659
- "ocpbm"
696660
- "osp_trunk"
697661
ocp_worker:
698-
amount: 10
662+
amount: 7
699663
uefi: true
700664
root_part_id: 4
701665
admin_user: core
@@ -717,28 +681,19 @@ cifmw_libvirt_manager_configuration:
717681
- # rack0 - ocp worker 1
718682
- "l00-ocp1"
719683
- "l01-ocp1"
720-
- # rack0 - ocp worker 2
721-
- "l00-ocp2"
722-
- "l01-ocp2"
723-
- # rack1 - ocp worker 3
684+
- # rack1 - ocp worker 2
724685
- "l10-ocp0"
725686
- "l11-ocp0"
726-
- # rack1 - ocp worker 4
687+
- # rack1 - ocp worker 3
727688
- "l10-ocp1"
728689
- "l11-ocp1"
729-
- # rack1 - ocp worker 5
730-
- "l10-ocp2"
731-
- "l11-ocp2"
732-
- # rack2 - ocp worker 6
690+
- # rack2 - ocp worker 4
733691
- "l20-ocp0"
734692
- "l21-ocp0"
735-
- # rack2 - ocp worker 7
693+
- # rack2 - ocp worker 5
736694
- "l20-ocp1"
737695
- "l21-ocp1"
738-
- # rack2 - ocp worker 8
739-
- "l20-ocp2"
740-
- "l21-ocp2"
741-
- # router - ocp_tester (worker 9)
696+
- # router - ocp_tester (worker 6)
742697
- "rtr-ocp"
743698
router:
744699
amount: 1
@@ -919,7 +874,7 @@ pre_deploy:
919874
num_racks: "{{ num_racks }}"
920875
router_bool: true
921876
edpm_nodes_per_rack: 5
922-
ocp_nodes_per_rack: 4
877+
ocp_nodes_per_rack: 3
923878
router_uplink_ip: 100.64.10.1
924879
cifmw_repo_setup_rhos_release_rpm: "{{ cifmw_repo_setup_rhos_release_rpm }}"
925880

0 commit comments

Comments
 (0)