remove an ocp node per rack

Author: eduolivares

scenarios/reproducers/bgp-l3-xl.yml

@@ -52,7 +52,6 @@ cifmw_libvirt_manager_network_interface_types:
   l00-ocp0: network
   l00-ocp1: network
   l00-ocp2: network
-  l00-ocp3: network
   l01-node0: network
   l01-node1: network
   l01-node2: network
@@ -61,7 +60,6 @@ cifmw_libvirt_manager_network_interface_types:
   l01-ocp0: network
   l01-ocp1: network
   l01-ocp2: network
-  l01-ocp3: network
   l10-node0: network
   l10-node1: network
   l10-node2: network
@@ -70,7 +68,6 @@ cifmw_libvirt_manager_network_interface_types:
   l10-ocp0: network
   l10-ocp1: network
   l10-ocp2: network
-  l10-ocp3: network
   l11-node0: network
   l11-node1: network
   l11-node2: network
@@ -79,7 +76,6 @@ cifmw_libvirt_manager_network_interface_types:
   l11-ocp0: network
   l11-ocp1: network
   l11-ocp2: network
-  l11-ocp3: network
   l20-node0: network
   l20-node1: network
   l20-node2: network
@@ -88,7 +84,6 @@ cifmw_libvirt_manager_network_interface_types:
   l20-ocp0: network
   l20-ocp1: network
   l20-ocp2: network
-  l20-ocp3: network
   l21-node0: network
   l21-node1: network
   l21-node2: network
@@ -97,7 +92,6 @@ cifmw_libvirt_manager_network_interface_types:
   l21-ocp0: network
   l21-ocp1: network
   l21-ocp2: network
-  l21-ocp3: network
 
 cifmw_libvirt_manager_configuration:
   networks:
@@ -236,11 +230,6 @@ cifmw_libvirt_manager_configuration:
         <name>l00-ocp2</name>
         <bridge name='l00-ocp2' stp='on' delay='0'/>
       </network>
-    l00-ocp3: |
-      <network>
-        <name>l00-ocp3</name>
-        <bridge name='l00-ocp3' stp='on' delay='0'/>
-      </network>
     l01-node0: |
       <network>
         <name>l01-node0</name>
@@ -281,11 +270,6 @@ cifmw_libvirt_manager_configuration:
         <name>l01-ocp2</name>
         <bridge name='l01-ocp2' stp='on' delay='0'/>
       </network>
-    l01-ocp3: |
-      <network>
-        <name>l01-ocp3</name>
-        <bridge name='l01-ocp3' stp='on' delay='0'/>
-      </network>
     ## rack1
     l10-node0: |
       <network>
@@ -327,11 +311,6 @@ cifmw_libvirt_manager_configuration:
         <name>l10-ocp2</name>
         <bridge name='l10-ocp2' stp='on' delay='0'/>
       </network>
-    l10-ocp3: |
-      <network>
-        <name>l10-ocp3</name>
-        <bridge name='l10-ocp3' stp='on' delay='0'/>
-      </network>
     l11-node0: |
       <network>
         <name>l11-node0</name>
@@ -372,11 +351,6 @@ cifmw_libvirt_manager_configuration:
         <name>l11-ocp2</name>
         <bridge name='l11-ocp2' stp='on' delay='0'/>
       </network>
-    l11-ocp3: |
-      <network>
-        <name>l11-ocp3</name>
-        <bridge name='l11-ocp3' stp='on' delay='0'/>
-      </network>
     ## rack2
     l20-node0: |
       <network>
@@ -418,11 +392,6 @@ cifmw_libvirt_manager_configuration:
         <name>l20-ocp2</name>
         <bridge name='l20-ocp2' stp='on' delay='0'/>
       </network>
-    l20-ocp3: |
-      <network>
-        <name>l20-ocp3</name>
-        <bridge name='l20-ocp3' stp='on' delay='0'/>
-      </network>
     l21-node0: |
       <network>
         <name>l21-node0</name>
@@ -463,11 +432,6 @@ cifmw_libvirt_manager_configuration:
         <name>l21-ocp2</name>
         <bridge name='l21-ocp2' stp='on' delay='0'/>
       </network>
-    l21-ocp3: |
-      <network>
-        <name>l21-ocp3</name>
-        <bridge name='l21-ocp3' stp='on' delay='0'/>
-      </network>
     ocpbm: |
       <network>
         <name>ocpbm</name>
@@ -695,7 +659,7 @@ cifmw_libvirt_manager_configuration:
         - "ocpbm"
         - "osp_trunk"
     ocp_worker:
-      amount: 10
+      amount: 7
       uefi: true
       root_part_id: 4
       admin_user: core
@@ -717,28 +681,19 @@ cifmw_libvirt_manager_configuration:
         -  # rack0 - ocp worker 1
           - "l00-ocp1"
           - "l01-ocp1"
-        -  # rack0 - ocp worker 2
-          - "l00-ocp2"
-          - "l01-ocp2"
-        -  # rack1 - ocp worker 3
+        -  # rack1 - ocp worker 2
           - "l10-ocp0"
           - "l11-ocp0"
-        -  # rack1 - ocp worker 4
+        -  # rack1 - ocp worker 3
           - "l10-ocp1"
           - "l11-ocp1"
-        -  # rack1 - ocp worker 5
-          - "l10-ocp2"
-          - "l11-ocp2"
-        -  # rack2 - ocp worker 6
+        -  # rack2 - ocp worker 4
           - "l20-ocp0"
           - "l21-ocp0"
-        -  # rack2 - ocp worker 7
+        -  # rack2 - ocp worker 5
           - "l20-ocp1"
           - "l21-ocp1"
-        -  # rack2 - ocp worker 8
-          - "l20-ocp2"
-          - "l21-ocp2"
-        -  # router - ocp_tester (worker 9)
+        -  # router - ocp_tester (worker 6)
           - "rtr-ocp"
     router:
       amount: 1
@@ -919,7 +874,7 @@ pre_deploy:
       num_racks: "{{ num_racks }}"
       router_bool: true
       edpm_nodes_per_rack: 5
-      ocp_nodes_per_rack: 4
+      ocp_nodes_per_rack: 3
       router_uplink_ip: 100.64.10.1
       cifmw_repo_setup_rhos_release_rpm: "{{ cifmw_repo_setup_rhos_release_rpm }}"