From 4a95b354901c81f135b61d39754e1419dd134f0e Mon Sep 17 00:00:00 2001
From: Carlos Goncalves <cgoncalves@redhat.com>
Date: Thu, 4 Jun 2020 19:44:23 +0200
Subject: [PATCH] Do not install diskimage-builder from Git

Diskimage-builder recently dropped Python 2 support (>= 3.0.0).
Installing DIB from Git pulls Python 3-only DIB which breaks Python 2
devstack environments.

This patch drops the option to install DIB from Git. DIB will now
install what is set in stable/train upper-constraints.txt [1].

[1] https://opendev.org/openstack/requirements/src/commit/4ae10f52cec8f6d870c7d862d22c66a64ce74f9f/upper-constraints.txt#L612

Depends-On: https://review.opendev.org/#/c/733778/
Change-Id: I057f9a8353de471d605a5a5c2860d7caa9d3bd28
---
 devstack/plugin.sh | 8 +-------
 devstack/settings  | 3 ---
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 1665f118b1..461a7e4fbb 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -39,13 +39,7 @@ function octavia_lib_install {
 }
 
 function install_diskimage_builder {
-    if use_library_from_git "diskimage-builder"; then
-        GITREPO["diskimage-builder"]=$DISKIMAGE_BUILDER_REPO_URL
-        GITDIR["diskimage-builder"]=$DISKIMAGE_BUILDER_DIR
-        GITBRANCH["diskimage-builder"]=$DISKIMAGE_BUILDER_REPO_REF
-        git_clone_by_name "diskimage-builder"
-        setup_dev_lib -bindep "diskimage-builder"
-    fi
+    setup_dev_lib -bindep "diskimage-builder"
 }
 
 function set_octavia_worker_image_owner_id {
diff --git a/devstack/settings b/devstack/settings
index c5b7b703fb..1ab0f5dc85 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -2,9 +2,6 @@
 
 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}
-DISKIMAGE_BUILDER_DIR=$DEST/diskimage-builder
 OCTAVIA_BIN_DIR=${OCTAVIA_BIN_DIR:-$(get_python_exec_prefix)}
 OCTAVIA_CONF_DIR=${OCTAVIA_CONF_DIR:-"/etc/octavia"}
 OCTAVIA_SSH_DIR=${OCTAVIA_SSH_DIR:-${OCTAVIA_CONF_DIR}/.ssh}