Actually install shade and oaktreemodel

Change-Id: I5b8dbd80c734527ede14d29bf332ecc406100195
This commit is contained in:
Monty Taylor 2016-11-06 08:09:39 -06:00
parent 1a69bfa39d
commit 7ee4290eb6
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
2 changed files with 5 additions and 5 deletions

View File

@ -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

View File

@ -5,4 +5,4 @@
pbr>=1.6
oaktreemodel
shade>=1.12.0
grpc
grpcio