Install tacker on controller node

In no-ha scenarios opendaylight role may not be collocated with
controller

Change-Id: Ic2040924949e7a0286ffeba795ea102face9bc0f
Signed-off-by: Michal Skalski <mskalski@mirantis.com>

diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index 730f0d1..136aac8 100755 (executable)
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -121,7 +121,7 @@ export FUEL_MASTER_IP=10.20.0.2
 export TACKER_SCRIPT_URL="https://git.opnfv.org/cgit/fuel/plain/prototypes/sfc_tacker/poc.tacker-up.sh?h=${GIT_BRANCH#*/}"
 export CONTROLLER_NODE_IP=$(sshpass -pr00tme /usr/bin/ssh -o UserKnownHostsFile=/dev/null \
     -o StrictHostKeyChecking=no root@$FUEL_MASTER_IP 'fuel node list' | \
-    grep opendaylight | cut -d'|' -f5)
+    grep controller | head -1 | cut -d'|' -f5)
 
 # we can't do much if we do not have the controller IP
 if [[ ! "$CONTROLLER_NODE_IP" =~ "10.20.0" ]]; then
@@ -149,8 +149,6 @@ send "/bin/mkdir -p /root/sfc-poc && cd /root/sfc-poc\r"
 expect "# "
 send "git clone https://gerrit.opnfv.org/gerrit/fuel && cd fuel\r"
 expect "# "
-send "git fetch https://gerrit.opnfv.org/gerrit/fuel refs/changes/97/10597/2 && git checkout FETCH_HEAD\r"
-expect "# "
 send "/bin/bash /root/sfc-poc/fuel/prototypes/sfc_tacker/poc.tacker-up.sh\r"
 expect "# "
 send "exit\r"