diff --git a/roles/libvirt_manager/tasks/deploy_layout.yml b/roles/libvirt_manager/tasks/deploy_layout.yml index eb9e1af0c8..6f86192c40 100644 --- a/roles/libvirt_manager/tasks/deploy_layout.yml +++ b/roles/libvirt_manager/tasks/deploy_layout.yml @@ -199,7 +199,11 @@ _init_admin_user: "{{ vm_data.value.admin_user | default('root') }}" ansible.builtin.include_tasks: file: create_vms.yml - loop: "{{ _layout.vms | dict2items }}" + loop: >- + {{ + _layout.vms | dictsort(reverse=true) | + community.general.dict | dict2items + }} loop_control: label: "{{ vm_data.key }}" loop_var: vm_data diff --git a/scenarios/reproducers/3-nodes.yml b/scenarios/reproducers/3-nodes.yml index 55d4704bb4..b038c74782 100644 --- a/scenarios/reproducers/3-nodes.yml +++ b/scenarios/reproducers/3-nodes.yml @@ -24,6 +24,16 @@ cifmw_root_partition_id: >- cifmw_libvirt_manager_compute_amount: 1 cifmw_libvirt_manager_configuration: vms: + crc: + admin_user: core + image_local_dir: "{{ ansible_user_dir }}/.crc/machines/crc/" + disk_file_name: "crc.qcow2" + disksize: 150 + memory: 32 + cpus: 24 + nets: + - public + - osp_trunk compute: uefi: "{{ cifmw_use_uefi }}" amount: "{{ [cifmw_libvirt_manager_compute_amount|int, 1] | max }}" @@ -51,16 +61,6 @@ cifmw_libvirt_manager_configuration: nets: - public - osp_trunk - crc: - admin_user: core - image_local_dir: "{{ ansible_user_dir }}/.crc/machines/crc/" - disk_file_name: "crc.qcow2" - disksize: 150 - memory: 32 - cpus: 24 - nets: - - public - - osp_trunk networks: public: |- diff --git a/scenarios/reproducers/external-ceph.yml b/scenarios/reproducers/external-ceph.yml index e09a05998f..df28c520cb 100644 --- a/scenarios/reproducers/external-ceph.yml +++ b/scenarios/reproducers/external-ceph.yml @@ -14,6 +14,18 @@ cifmw_libvirt_manager_configuration: vms: + ocp: + amount: 3 + admin_user: core + image_local_dir: "/home/dev-scripts/pool" + 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 + nets: + - osp_trunk compute: uefi: "{{ cifmw_use_uefi | default(false) }}" root_part_id: >- @@ -67,15 +79,3 @@ cifmw_libvirt_manager_configuration: nets: - ocpbm - osp_trunk - ocp: - amount: 3 - admin_user: core - image_local_dir: "/home/dev-scripts/pool" - 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 - nets: - - osp_trunk diff --git a/scenarios/reproducers/va-hci.yml b/scenarios/reproducers/va-hci.yml index 5f02870beb..376176dbdd 100644 --- a/scenarios/reproducers/va-hci.yml +++ b/scenarios/reproducers/va-hci.yml @@ -92,6 +92,18 @@ cifmw_libvirt_manager_configuration: vms: + ocp: + amount: 3 + admin_user: core + image_local_dir: "/home/dev-scripts/pool" + 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 + nets: + - osp_trunk compute: uefi: "{{ cifmw_use_uefi }}" root_part_id: "{{ cifmw_root_partition_id }}" @@ -119,18 +131,6 @@ cifmw_libvirt_manager_configuration: nets: - ocpbm - osp_trunk - ocp: - amount: 3 - admin_user: core - image_local_dir: "/home/dev-scripts/pool" - 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 - nets: - - osp_trunk ## devscript support for OCP deploy