From efeb4da03e31770246a8e715133ce9153561c8a5 Mon Sep 17 00:00:00 2001
From: Gregory Thiemonge <gthiemon@redhat.com>
Date: Tue, 14 Jun 2022 21:20:56 +0200
Subject: [PATCH] Fix amphora build on stable/ussuri

Octavia stable/ussuri installs diskimage-builder from the master branch,
but DIB has recently removed the support for py36.
Checkout the last DIB commit that supports py36, and also use the
requirements from stable/ussuri instead of master.

Change-Id: Id763dee0cc048d3d5fe601ce51097581d3c1c4e3
---
 devstack/plugin.sh | 3 ++-
 devstack/settings  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 99aca187d7..da7bf68ab2 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -117,8 +117,9 @@ function build_octavia_worker_image {
             export PATH=$DIB_VENV_DIR/bin:$PATH
             if ! [ -d $DIB_GIT_DIR ]; then
                 git clone ${GITREPO["diskimage-builder"]} $DIB_GIT_DIR
+                (cd $DIB_GIT_DIR && git checkout $DISKIMAGE_BUILDER_REPO_REF)
             fi
-            (cd $REQUIREMENTS_DIR && git show origin/master:upper-constraints.txt) | sed '/diskimage-builder/d' > $DIB_VENV_DIR/u-c.txt
+            (cd $REQUIREMENTS_DIR && git show origin/stable/ussuri:upper-constraints.txt) | sed '/diskimage-builder/d' > $DIB_VENV_DIR/u-c.txt
             pip install -c $DIB_VENV_DIR/u-c.txt $DIB_GIT_DIR
             $OCTAVIA_DIR/diskimage-create/diskimage-create.sh -l ${dib_logs}/$(basename $OCTAVIA_AMP_IMAGE_FILE).log $octavia_dib_tracing_arg -o $OCTAVIA_AMP_IMAGE_FILE ${PARAM_OCTAVIA_AMP_BASE_OS:-} ${PARAM_OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID:-} ${PARAM_OCTAVIA_AMP_IMAGE_SIZE:-}
         )
diff --git a/devstack/settings b/devstack/settings
index 62cc5b715c..54e5641ea0 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -3,7 +3,8 @@
 OCTAVIA=${OCTAVIA:-"octavia"}
 OCTAVIA_DIR=${OCTAVIA_DIR:-"${DEST}/octavia"}
 DISKIMAGE_BUILDER_REPO_URL=${DISKIMAGE_BUILDER_REPO_URL:-${GIT_BASE}/openstack/diskimage-builder.git}
-DISKIMAGE_BUILDER_REPO_REF=${DISKIMAGE_BUILDER_REPO_REF:-master}
+# Latest commit with py36 support
+DISKIMAGE_BUILDER_REPO_REF=${DISKIMAGE_BUILDER_REPO_REF:-70e90e17551499b1f8d0c2d0bc36ee4698aa18a0}
 DISKIMAGE_BUILDER_DIR=$DEST/diskimage-builder
 OCTAVIA_BIN_DIR=${OCTAVIA_BIN_DIR:-$(get_python_exec_prefix)}
 OCTAVIA_CONF_DIR=${OCTAVIA_CONF_DIR:-"/etc/octavia"}