From f110afc4f94862441318d50cf604020519cb9139 Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@protonmail.com>
Date: Thu, 2 Jan 2020 16:17:17 +0100
Subject: [PATCH] devstack: switch to using CentOS 8 DIB ramdisks by default

The CentOS 7 ones no longer work because of the Python 3 transition.

Change-Id: I68fc6f87879a53198810ad64f9570c41ccf8ce7f
---
 devstack/lib/ironic     | 14 ++++++++++++--
 zuul.d/ironic-jobs.yaml |  4 ++--
 zuul.d/project.yaml     |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index caa1966179..e8bfcf553c 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -259,7 +259,8 @@ IPA_DOWNLOAD_BRANCH=${IPA_DOWNLOAD_BRANCH:-master}
 IPA_DOWNLOAD_BRANCH=$(echo $IPA_DOWNLOAD_BRANCH | tr / -)
 
 # OS for using with DIB images
-IRONIC_DIB_RAMDISK_OS=centos7
+IRONIC_DIB_RAMDISK_OS=${IRONIC_DIB_RAMDISK_OS:-centos8}
+IRONIC_DIB_RAMDISK_RELEASE=${IRONIC_DIB_RAMDISK_RELEASE:-}
 
 # Configure URLs required to download ramdisk if we're not building it, and
 # IRONIC_DEPLOY_RAMDISK/KERNEL or the RAMDISK/KERNEL_URLs have not been
@@ -283,7 +284,15 @@ fi
 
 # This refers the options for disk-image-create and the platform on which
 # to build the dib based ironic-python-agent ramdisk.
-IRONIC_DIB_RAMDISK_OPTIONS=${IRONIC_DIB_RAMDISK_OPTIONS:-"$IRONIC_DIB_RAMDISK_OS"}
+IRONIC_DIB_RAMDISK_OPTIONS=${IRONIC_DIB_RAMDISK_OPTIONS:-}
+if [[ -z "$IRONIC_DIB_RAMDISK_OPTIONS" ]]; then
+    if [[ "$IRONIC_DIB_RAMDISK_OS" == "centos8" ]]; then
+        # Adapt for DIB naming change
+        IRONIC_DIB_RAMDISK_OS=centos-minimal
+        IRONIC_DIB_RAMDISK_RELEASE=8
+    fi
+    IRONIC_DIB_RAMDISK_OPTIONS="$IRONIC_DIB_RAMDISK_OS"
+fi
 # DHCP timeout for the dhcp-all-interfaces element.
 IRONIC_DIB_DHCP_TIMEOUT=${IRONIC_DIB_DHCP_TIMEOUT:-60}
 
@@ -2539,6 +2548,7 @@ function build_ipa_dib_ramdisk {
     git_clone $IRONIC_PYTHON_AGENT_BUILDER_REPO $IRONIC_PYTHON_AGENT_BUILDER_DIR $IRONIC_PYTHON_AGENT_BUILDER_BRANCH
     ELEMENTS_PATH="$IRONIC_PYTHON_AGENT_BUILDER_DIR/dib" \
         DIB_DHCP_TIMEOUT=$IRONIC_DIB_DHCP_TIMEOUT \
+        DIB_RELEASE=$IRONIC_DIB_RAMDISK_RELEASE \
         disk-image-create "$IRONIC_DIB_RAMDISK_OPTIONS" \
         -x -o  "$tempdir/ironic-agent" \
         ironic-python-agent-ramdisk
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index e0cb26c934..92540fe45d 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -579,7 +579,7 @@
       - ^tox.ini$
 
 - job:
-    name: ironic-tempest-ipa-wholedisk-bios-ipmi-direct-dib-centos7
+    name: ironic-tempest-ipa-wholedisk-bios-ipmi-direct-dib
     parent: ironic-base
     timeout: 9600
     vars:
@@ -592,7 +592,7 @@
       devstack_localrc:
         IRONIC_DEFAULT_DEPLOY_INTERFACE: direct
         IRONIC_RAMDISK_TYPE: dib
-        IRONIC_DIB_RAMDISK_OS: centos7
+        IRONIC_DIB_RAMDISK_OS: centos8
         IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True
         IRONIC_TEMPEST_BUILD_TIMEOUT: 900
         IRONIC_VM_EPHEMERAL_DISK: 0
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 7227596cd4..8e3b3a3d2b 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -38,7 +38,7 @@
             voting: false
         - ironic-inspector-tempest-partition-bios-redfish-vmedia:
             voting: false
-        - ironic-tempest-ipa-wholedisk-bios-ipmi-direct-dib-centos7:
+        - ironic-tempest-ipa-wholedisk-bios-ipmi-direct-dib:
             voting: false
         - bifrost-integration-tinyipa-ubuntu-xenial:
             voting: false