From c13951e0d8d0b14701448542f1dd1587d367ee74 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Wed, 21 Dec 2016 21:26:30 +1100
Subject: [PATCH] Add glean libs-from-git install

Change I1479c5ff5e548da559be6dc8eb51d9635a0e2c7e has added glean as
lib-from-git install, but we're not installing it in the plugin.  Add
it.

Change-Id: I144cbef93a0831cbe21b77d499130cedc2d6cc7f
---
 devstack/plugin.sh | 13 +++++++++++++
 devstack/settings  |  3 +++
 2 files changed, 16 insertions(+)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 2dfae3b89..6526491bd 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -48,11 +48,24 @@ function install_diskimage_builder {
     fi
 }
 
+function install_glean {
+    if use_library_from_git "glean"; then
+        GITREPO["glean"]=$GLEAN_REPO_URL
+        GITDIR["glean"]=$DEST/glean
+        GITBRANCH["glean"]=$GLEAN_REPO_REF
+        git_clone_by_name "glean"
+        setup_dev_lib "glean"
+        $NODEPOOL_INSTALL/bin/pip install -e $DEST/glean
+    fi
+}
+
+
 # Install nodepool code
 function install_nodepool {
     virtualenv $NODEPOOL_INSTALL
     install_shade
     install_diskimage_builder
+    install_glean
 
     setup_develop $DEST/nodepool
     $NODEPOOL_INSTALL/bin/pip install -e $DEST/nodepool
diff --git a/devstack/settings b/devstack/settings
index 5e162bd34..d42263511 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -18,6 +18,9 @@ SHADE_REPO_REF=${SHADE_REPO_REF:-master}
 DISKIMAGE_BUILDER_REPO_URL=${DISKIMAGE_BUILDER_REPO_URL:-https://git.openstack.org/openstack/diskimage-builder}
 DISKIMAGE_BUILDER_REPO_REF=${DISKIMAGE_BUILDER_REPO_REF:-master}
 
+GLEAN_REPO_URL=${GLEAN_REPO_URL:-https://git.openstack.org/openstack/glean}
+GLEAN_REPO_REF=${GLEAN_REPO_REF:-master}
+
 enable_service geard
 enable_service statsd
 enable_service nodepool