From 5244ff8f474ffa305bc1d83de8531a3c12235ef6 Mon Sep 17 00:00:00 2001
From: Rafael Castillo <rcastill@redhat.com>
Date: Tue, 15 Mar 2022 14:52:08 -0700
Subject: [PATCH] Use whole disk images in libvirt deploy

This changes libvirt jobs to use whole disk images while still using tar
images for the undercloud base.

Change-Id: I741065c9a0c33a18c9c1f3ba4f49d0568b4827c5
---
 .../centosci/CentOS-9/master-current-tripleo.yml     | 12 +++++++++++-
 .../centosci/CentOS-9/wallaby-current-tripleo.yml    |  9 ++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/config/release/centosci/CentOS-9/master-current-tripleo.yml b/config/release/centosci/CentOS-9/master-current-tripleo.yml
index 72de8b1c8..1b093ed2a 100644
--- a/config/release/centosci/CentOS-9/master-current-tripleo.yml
+++ b/config/release/centosci/CentOS-9/master-current-tripleo.yml
@@ -3,13 +3,13 @@ distro_ver: centos9
 dlrn_hash_tag: current-tripleo
 docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}"
 dlrn_baseurl: "https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }}"
-overcloud_image_url: "https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/overcloud-full.tar"
 ipa_image_url: "https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar"
 
 docker_registry_host: trunk.registry.rdoproject.org
 docker_registry_namespace: tripleomastercentos9
 
 overcloud_as_undercloud: true
+whole_disk_images: true
 update_images: true
 
 libvirt_session_socket: virtqemud-sock
@@ -26,10 +26,20 @@ overcloud_image_type: >-
   {%- else -%}
   tar
   {%- endif -%}
+overcloud_image_url: "https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/{{ overcloud_image }}.{{ overcloud_image_type }}"
+
+# overcloud-hardened-uefi full can't currently be used as undercloud base
+undercloud_base_image: overcloud_full
+undercloud_base_image_type: tar
+undercloud_base_image_url: "https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/{{ undercloud_base_image }}.{{ undercloud_base_image_type }}"
+
 images:
   - name: "{{ overcloud_image }}"
     url: "{{ overcloud_image_url }}"
     type: "{{ overcloud_image_type }}"
+  - name: "{{ undercloud_base_image }}"
+    url: "{{ undercloud_base_image_url }}"
+    type: "{{ undercloud_base_image_type }}"
   - name: ipa_images
     url: "{{ ipa_image_url }}"
     type: tar
diff --git a/config/release/centosci/CentOS-9/wallaby-current-tripleo.yml b/config/release/centosci/CentOS-9/wallaby-current-tripleo.yml
index ff58dccc7..2f7343ee7 100644
--- a/config/release/centosci/CentOS-9/wallaby-current-tripleo.yml
+++ b/config/release/centosci/CentOS-9/wallaby-current-tripleo.yml
@@ -3,13 +3,13 @@ distro_ver: centos9
 dlrn_hash_tag: current-tripleo
 docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}"
 dlrn_baseurl: "https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }}"
-overcloud_image_url: "https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/overcloud-full.tar"
 ipa_image_url: "https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar"
 
 docker_registry_host: trunk.registry.rdoproject.org
 docker_registry_namespace: tripleowallabycentos9
 
 overcloud_as_undercloud: true
+whole_disk_images: true
 update_images: true
 
 libvirt_session_socket: virtqemud-sock
@@ -26,6 +26,13 @@ overcloud_image_type: >-
   {%- else -%}
   tar
   {%- endif -%}
+overcloud_image_url: "https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/{{ overcloud_image }}.{{ overcloud_image_type }}"
+
+# overcloud-hardened-uefi full can't currently be used as undercloud base
+undercloud_base_image: overcloud_full
+undercloud_base_image_type: tar
+undercloud_base_image_url: "https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/{{ undercloud_base_image }}.{{ undercloud_base_image_type }}"
+
 images:
   - name: "{{ overcloud_image }}"
     url: "{{ overcloud_image_url }}"