Rebase on master

scenarios/reproducers/dt-osasinfra.yml

@@ -57,25 +57,43 @@ cifmw_libvirt_manager_configuration:
         <name>osp_trunk</name>
         <forward mode='nat'/>
         <bridge name='osp_trunk' stp='on' delay='0'/>
+        <dns enable="no"/>
         <ip family='ipv4'
         address='{{ cifmw_networking_definition.networks.ctlplane.network |
                     ansible.utils.nthhost(1) }}'
         prefix='{{ cifmw_networking_definition.networks.ctlplane.network |
                    ansible.utils.ipaddr('prefix') }}'>
         </ip>
       </network>
+    ocpbm: |
+      <network>
+        <name>ocpbm</name>
+        <forward mode='nat'/>
+        <bridge name='ocpbm' stp='on' delay='0'/>
+        <dns enable="no"/>
+        <ip family='ipv4' address='192.168.111.1' prefix='24'>
+        </ip>
+      </network>
+    ocppr: |
+      <network>
+        <name>ocppr</name>
+        <forward mode='bridge'/>
+        <bridge name='ocppr'/>
+      </network>
   vms:
     ocp:
       amount: 3
       admin_user: core
-      image_local_dir: "/home/dev-scripts/pool"
+      image_local_dir: "{{ cifmw_basedir }}/images/"
       disk_file_name: "ocp_master"
-      disksize: "105"
-      xml_paths:
-        - /home/dev-scripts/ocp_master_0.xml
-        - /home/dev-scripts/ocp_master_1.xml
-        - /home/dev-scripts/ocp_master_2.xml
+      disksize: "100"
+      cpus: 16
+      memory: 32
+      root_part_id: 4
+      uefi: true
       nets:
+        - ocppr
+        - ocpbm
         - osp_trunk
     compute:
       uefi: "{{ cifmw_use_uefi }}"
@@ -107,10 +125,6 @@ cifmw_libvirt_manager_configuration:
 
 ## devscript support for OCP deploy
 cifmw_devscripts_config_overrides:
-  worker_memory: 16384
-  worker_disk: 100
-  worker_vcpu: 10
-  num_extra_workers: 0
   fips_mode: "{{ cifmw_fips_enabled | default(false) | bool }}"
 
 # Note: with that extra_network_names "osp_trunk", we instruct