From 34dcacfdbad25452d35a0beba1294631fbac3dd6 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sun, 21 Oct 2018 08:24:03 -0500
Subject: [PATCH] Make functional src jobs actually install from source

devstack will happily install openstacksdk from source here just from
required-projects, but we install nodepool into a virtualenv, and that
is just doing a pip install.

Add an install_openstacksdk function that installs openstacksdk into the
virtualenv so that the devstack magic for installing from source works.

Change-Id: I68c16d8601f6fd96863f205094d27c0da09ef73c
---
 devstack/plugin.sh | 12 ++++++++++++
 requirements.txt   |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index cc049e853..75d42eb47 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -43,6 +43,13 @@ function install_glean {
 }
 
 
+function install_openstacksdk {
+    if use_library_from_git "openstacksdk"; then
+        git_clone_by_name "openstacksdk"
+        $NODEPOOL_INSTALL/bin/pip install $DEST/openstacksdk
+    fi
+}
+
 # Install nodepool code
 function install_nodepool {
     VENV="virtualenv -p python3"
@@ -52,6 +59,11 @@ function install_nodepool {
 
     setup_develop $DEST/nodepool
     $NODEPOOL_INSTALL/bin/pip install $DEST/nodepool
+
+    # TODO(mordred) Install openstacksdk after nodepool so that if we're
+    # in the -src job we don't re-install from the requirement.
+    # We should make this more resilient, probably using install-siblings.
+    install_openstacksdk
     $NODEPOOL_INSTALL/bin/pbr freeze
 }
 
diff --git a/requirements.txt b/requirements.txt
index a7d9df43f..f924c3a82 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ extras
 statsd>=3.0
 sqlalchemy>=0.8.2,<1.1.0
 PrettyTable>=0.6,<0.8
-openstacksdk>=0.17.2
+openstacksdk>=0.17.2,!=0.18.0
 diskimage-builder>=2.0.0
 voluptuous
 kazoo