From 7ee4290eb620bf82d54bcd881e313565be2085c7 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sun, 6 Nov 2016 08:09:39 -0600
Subject: [PATCH] Actually install shade and oaktreemodel

Change-Id: I5b8dbd80c734527ede14d29bf332ecc406100195
---
 devstack/plugin.sh | 8 ++++----
 requirements.txt   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 8d337d1..08ddd52 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -22,8 +22,6 @@ function install_shade {
         GITDIR["shade"]=$DEST/shade
         GITBRANCH["shade"]=$SHADE_REPO_REF
         git_clone_by_name "shade"
-        # Install shade globally, because the job config has LIBS_FROM_GIT
-        # and if we don't install it globally, all hell breaks loose
         setup_dev_lib "shade"
     fi
 }
@@ -40,10 +38,10 @@ function install_oaktreemodel {
         mkdir $GOPATH
         export PATH=$GOPATH/bin:$PATH
         go get -u github.com/golang/protobuf/protoc-gen-go
+        sudo pip install grpcio grpcio-tools
         ./bootstrap.sh
         ./configure
         make
-        sudo make install
         sudo pip install -e .
         popd
     fi
@@ -53,7 +51,7 @@ function install_oaktreemodel {
 function install_oaktree {
     if use_library_from_git "oaktree"; then
         GITREPO["oaktree"]=$OAKTREE_REPO_URL
-        GITDIR["oaktree"]=$DEST/shade
+        GITDIR["oaktree"]=$DEST/oaktree
         GITBRANCH["oaktree"]=$OAKTREE_REPO_REF
         git_clone_by_name "oaktree"
         setup_dev_lib "oaktree"
@@ -92,6 +90,8 @@ if is_service_enabled oaktree; then
     if [[ "$1" == "stack" && "$2" == "install" ]]; then
         # Perform installation of service source
         echo_summary "Installing oaktree"
+        install_shade
+        install_oaktreemodel
         install_oaktree
 
     elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
diff --git a/requirements.txt b/requirements.txt
index c564e92..c20dad1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,4 +5,4 @@
 pbr>=1.6
 oaktreemodel
 shade>=1.12.0
-grpc
+grpcio