Browse Source

Use tacker server/client rebased to stable/liberty

Signed-off-by: Michal Skalski <mskalski@mirantis.com>
Michal Skalski 3 years ago
parent
commit
eb5e41bb1a
1 changed files with 4 additions and 6 deletions
  1. 4
    6
      pre_build_hook

+ 4
- 6
pre_build_hook View File

@@ -9,11 +9,11 @@ MODULES="${DIR}/deployment_scripts/puppet/modules"
9 9
 
10 10
 TOSCA_PARSER=${TOSCA_PARSER:-http://mirrors.kernel.org/ubuntu/pool/universe/p/python-tosca-parser/python-tosca-parser_0.1.0-3_all.deb}
11 11
 #tacker server
12
-TACKER_REPO=${TACKER_REPO:-https://github.com/trozet/tacker}
13
-TACKER_BRANCH=${TACKER_BRANCH:-SFC_brahmaputra}
12
+TACKER_REPO=${TACKER_REPO:-https://github.com/michalskalski/tacker}
13
+TACKER_BRANCH=${TACKER_BRANCH:-liberty-sfc}
14 14
 
15
-TACKER_CLI_REPO=${TACKER_CLI_REPO:-https://github.com/openstack/python-tackerclient}
16
-TACKER_CLI_BRANCH=${TACKER_CLI_BRANCH:-stable/liberty}
15
+TACKER_CLI_REPO=${TACKER_CLI_REPO:-https://github.com/michalskalski/python-tackerclient}
16
+TACKER_CLI_BRANCH=${TACKER_CLI_BRANCH:-liberty-sfc}
17 17
 
18 18
 TACKER_HORIZON_REPO=${TACKER_HORIZON_REPO:-https://github.com/openstack/tacker-horizon}
19 19
 TACKER_HORIZON_BRANCH=${TACKER_HORIZON_BRANCH:-stable/liberty}
@@ -66,8 +66,6 @@ pushd $TMP_DIR
66 66
 git clone $TACKER_REPO tacker 
67 67
 pushd tacker
68 68
 git checkout $TACKER_BRANCH
69
-#include changes which fix dependencies for liberty
70
-git am < ${DIR}/tacker_package/requirements-liberty.patch
71 69
 popd
72 70
 
73 71
 git clone $TACKER_CLI_REPO python-tackerclient

Loading…
Cancel
Save