Browse Source

Actually install shade and oaktreemodel

Change-Id: I5b8dbd80c734527ede14d29bf332ecc406100195
changes/82/394182/6
Monty Taylor 2 years ago
parent
commit
7ee4290eb6
No account linked to committer's email address
2 changed files with 5 additions and 5 deletions
  1. 4
    4
      devstack/plugin.sh
  2. 1
    1
      requirements.txt

+ 4
- 4
devstack/plugin.sh View File

@@ -22,8 +22,6 @@ function install_shade {
22 22
         GITDIR["shade"]=$DEST/shade
23 23
         GITBRANCH["shade"]=$SHADE_REPO_REF
24 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 25
         setup_dev_lib "shade"
28 26
     fi
29 27
 }
@@ -40,10 +38,10 @@ function install_oaktreemodel {
40 38
         mkdir $GOPATH
41 39
         export PATH=$GOPATH/bin:$PATH
42 40
         go get -u github.com/golang/protobuf/protoc-gen-go
41
+        sudo pip install grpcio grpcio-tools
43 42
         ./bootstrap.sh
44 43
         ./configure
45 44
         make
46
-        sudo make install
47 45
         sudo pip install -e .
48 46
         popd
49 47
     fi
@@ -53,7 +51,7 @@ function install_oaktreemodel {
53 51
 function install_oaktree {
54 52
     if use_library_from_git "oaktree"; then
55 53
         GITREPO["oaktree"]=$OAKTREE_REPO_URL
56
-        GITDIR["oaktree"]=$DEST/shade
54
+        GITDIR["oaktree"]=$DEST/oaktree
57 55
         GITBRANCH["oaktree"]=$OAKTREE_REPO_REF
58 56
         git_clone_by_name "oaktree"
59 57
         setup_dev_lib "oaktree"
@@ -92,6 +90,8 @@ if is_service_enabled oaktree; then
92 90
     if [[ "$1" == "stack" && "$2" == "install" ]]; then
93 91
         # Perform installation of service source
94 92
         echo_summary "Installing oaktree"
93
+        install_shade
94
+        install_oaktreemodel
95 95
         install_oaktree
96 96
 
97 97
     elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then

+ 1
- 1
requirements.txt View File

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

Loading…
Cancel
Save