From cb7d5133e7d3082c32a505cebf3ee6167fec4812 Mon Sep 17 00:00:00 2001
From: Carlos Goncalves <cgoncalves@redhat.com>
Date: Thu, 24 Sep 2020 12:01:14 +0200
Subject: [PATCH] Ensure install of diskimage-create.sh requirements

Change I612ea1c583090897bd44453b867d75929a01b7fc [1] removed
diskimage-builder from the root requirements.txt file. Devstack
deployments not setting LIBS_FROM_GIT+=diskimage-builder will not
install diskimage-builder. This means our diskimage-create.sh tool will
fail to build amphora images and abort the deployment.

[1] https://review.opendev.org/#/c/741960/

Change-Id: Id535d2d5ea6c23c9646c568a17d7695f82c0c1a9
---
 devstack/plugin.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index de67d5f873..3d31b0ce54 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -52,6 +52,8 @@ function install_diskimage_builder {
         GITBRANCH["diskimage-builder"]=$DISKIMAGE_BUILDER_REPO_REF
         git_clone_by_name "diskimage-builder"
         setup_dev_lib -bindep "diskimage-builder"
+    else
+        pip_install -r $OCTAVIA_DIR/diskimage-create/requirements.txt
     fi
 }