From 1a96493a23fd7fb4c4df3537b6383137c44c1336 Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Thu, 24 Jun 2021 09:21:26 +1200
Subject: [PATCH] Add missing ipa images to overcloud-hardened-images-uefi

CI jobs which build images will include a config file then run the
command to build all images. This means that
overcloud-hardened-images-uefi needs to do the same thing as
overcloud-full, and have the image definition for ironic-python-agent
as well as overcloud-hardened-uefi-full.

Without this change the ironic-python-agent image won't be built and
the CI job will fail.

Blueprint: whole-disk-default
Change-Id: I8b5ad48920db4311bf6a63d61fc486446bef8c22
---
 ...vercloud-hardened-images-uefi-centos8.yaml | 11 ++++++++--
 ...vercloud-hardened-images-uefi-python3.yaml | 21 +++++++++++++++++++
 .../overcloud-hardened-images-uefi-rhel8.yaml | 11 ++++++++--
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/image-yaml/overcloud-hardened-images-uefi-centos8.yaml b/image-yaml/overcloud-hardened-images-uefi-centos8.yaml
index be42f5135..7d3840a48 100644
--- a/image-yaml/overcloud-hardened-images-uefi-centos8.yaml
+++ b/image-yaml/overcloud-hardened-images-uefi-centos8.yaml
@@ -3,8 +3,15 @@ disk_images:
     imagename: overcloud-hardened-uefi-full
     type: qcow2
     distro: centos
-    environment:
-      DIB_RELEASE: '8'
+    release: 8
     elements:
       - selinux-permissive
       - interface-names
+  -
+    imagename: ironic-python-agent
+    type: qcow2
+    distro: centos
+    release: 8
+    elements:
+      - selinux-permissive
+      - interface-names
\ No newline at end of file
diff --git a/image-yaml/overcloud-hardened-images-uefi-python3.yaml b/image-yaml/overcloud-hardened-images-uefi-python3.yaml
index 6fc4343f5..3fac65a6f 100644
--- a/image-yaml/overcloud-hardened-images-uefi-python3.yaml
+++ b/image-yaml/overcloud-hardened-images-uefi-python3.yaml
@@ -42,3 +42,24 @@ disk_images:
       DIB_IMAGE_SIZE: '40'
       COMPRESS_IMAGE: '1'
       DIB_BLOCK_DEVICE: 'efi'
+  -
+    imagename: ironic-python-agent
+    # This is bogus, but there's no initrd type in diskimage-builder
+    type: qcow2
+    # So we just override the extension instead
+    imageext: initramfs
+    elements:
+      - ironic-python-agent-ramdisk
+      - ironic-agent-multipath
+      - dynamic-login
+      - element-manifest
+      - network-gateway
+      - enable-packages-install
+      - override-pip-and-virtualenv
+      - extra-hardware
+    options:
+      - "--min-tmpfs=7"
+    environment:
+      DIB_EPEL_DISABLED: '1'
+      DIB_PYTHON_VERSION: '3'
+      DIB_DHCP_TIMEOUT: '60'
diff --git a/image-yaml/overcloud-hardened-images-uefi-rhel8.yaml b/image-yaml/overcloud-hardened-images-uefi-rhel8.yaml
index 2d243c835..4b21a131b 100644
--- a/image-yaml/overcloud-hardened-images-uefi-rhel8.yaml
+++ b/image-yaml/overcloud-hardened-images-uefi-rhel8.yaml
@@ -3,9 +3,16 @@ disk_images:
     imagename: overcloud-hardened-uefi-full
     type: qcow2
     distro: rhel
-    environment:
-      DIB_RELEASE: '8'
+    release: 8
     elements:
       - interface-names
     packages:
       - rhosp-release
+  -
+    imagename: ironic-python-agent
+    type: qcow2
+    distro: rhel
+    release: 8
+    elements:
+      - selinux-permissive
+      - interface-names
\ No newline at end of file