summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2016-11-06 08:09:39 -0600
committerMonty Taylor <mordred@inaugust.com>2016-11-07 09:44:54 -0600
commit7ee4290eb620bf82d54bcd881e313565be2085c7 (patch)
treed2b76c58366fbca26064b112402ab40e0d6efca3
parent1a69bfa39da706865382c37a51619c76fd6f6548 (diff)
Actually install shade and oaktreemodel
Notes
Notes (review): Code-Review+2: Monty Taylor <mordred@inaugust.com> Workflow+1: Monty Taylor <mordred@inaugust.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 07 Nov 2016 18:22:38 +0000 Reviewed-on: https://review.openstack.org/394182 Project: openstack/oaktree Branch: refs/heads/master
-rw-r--r--devstack/plugin.sh8
-rw-r--r--requirements.txt2
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 {
22 GITDIR["shade"]=$DEST/shade 22 GITDIR["shade"]=$DEST/shade
23 GITBRANCH["shade"]=$SHADE_REPO_REF 23 GITBRANCH["shade"]=$SHADE_REPO_REF
24 git_clone_by_name "shade" 24 git_clone_by_name "shade"
25 # Install shade globally, because the job config has LIBS_FROM_GIT
26 # and if we don't install it globally, all hell breaks loose
27 setup_dev_lib "shade" 25 setup_dev_lib "shade"
28 fi 26 fi
29} 27}
@@ -40,10 +38,10 @@ function install_oaktreemodel {
40 mkdir $GOPATH 38 mkdir $GOPATH
41 export PATH=$GOPATH/bin:$PATH 39 export PATH=$GOPATH/bin:$PATH
42 go get -u github.com/golang/protobuf/protoc-gen-go 40 go get -u github.com/golang/protobuf/protoc-gen-go
41 sudo pip install grpcio grpcio-tools
43 ./bootstrap.sh 42 ./bootstrap.sh
44 ./configure 43 ./configure
45 make 44 make
46 sudo make install
47 sudo pip install -e . 45 sudo pip install -e .
48 popd 46 popd
49 fi 47 fi
@@ -53,7 +51,7 @@ function install_oaktreemodel {
53function install_oaktree { 51function install_oaktree {
54 if use_library_from_git "oaktree"; then 52 if use_library_from_git "oaktree"; then
55 GITREPO["oaktree"]=$OAKTREE_REPO_URL 53 GITREPO["oaktree"]=$OAKTREE_REPO_URL
56 GITDIR["oaktree"]=$DEST/shade 54 GITDIR["oaktree"]=$DEST/oaktree
57 GITBRANCH["oaktree"]=$OAKTREE_REPO_REF 55 GITBRANCH["oaktree"]=$OAKTREE_REPO_REF
58 git_clone_by_name "oaktree" 56 git_clone_by_name "oaktree"
59 setup_dev_lib "oaktree" 57 setup_dev_lib "oaktree"
@@ -92,6 +90,8 @@ if is_service_enabled oaktree; then
92 if [[ "$1" == "stack" && "$2" == "install" ]]; then 90 if [[ "$1" == "stack" && "$2" == "install" ]]; then
93 # Perform installation of service source 91 # Perform installation of service source
94 echo_summary "Installing oaktree" 92 echo_summary "Installing oaktree"
93 install_shade
94 install_oaktreemodel
95 install_oaktree 95 install_oaktree
96 96
97 elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then 97 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 @@
5pbr>=1.6 5pbr>=1.6
6oaktreemodel 6oaktreemodel
7shade>=1.12.0 7shade>=1.12.0
8grpc 8grpcio