summaryrefslogtreecommitdiffstats
path: root/jjb/fuel
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-02-19 00:37:24 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-02-18 23:38:21 +0000
commitdeab8b9e2eed4811ced77c5ff3b9984f6438a234 (patch)
treebc2a0f1598ca9364f2c19f5d415cc2d1ae7ed853 /jjb/fuel
parent14feff40c8d0782ee320f54c7d7d7670bb1d7be5 (diff)
fuel: Fix pattern matching and node ip extraction for sfc scenario
Change-Id: Ib69806739462c74c616a5fad352bd8732d67e996 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/fuel')
-rwxr-xr-xjjb/fuel/fuel-deploy.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index bc2080b0d..da08f31c4 100755
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -91,7 +91,7 @@ echo "--------------------------------------------------------"
echo "Deployment is done successfully!"
# Quick and dirty fix for SFC scenatio - will be fixed properly post-release
-if [[ "$DEPLOY_SCENARIO" !~ "os-odl_l2-sfc" ]]; then
+if [[ ! "$DEPLOY_SCENARIO" =~ "os-odl_l2-sfc" ]]; then
exit 0
fi
@@ -100,11 +100,12 @@ echo "SFC Scenario is deployed"
# The stuff below is here temporarily and will be fixed once the release is out
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 ssh -t fuel 'fuel node list' | \
- grep 'controller, opendaylight' | cut -d'|' -f5)
+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)
# we can't do much if we do not have the controller IP
-if [[ "$CONTROLLER_NODE_IP" !~ "^10.20.0" ]]; then
+if [[ ! "$CONTROLLER_NODE_IP" =~ "10.20.0" ]]; then
echo "Unable to retrieve controller IP"
exit 1
fi