summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-01-07 11:08:46 -0500
committerTim Rozet <trozet@redhat.com>2016-01-07 16:06:09 -0500
commitddb27a25b168c79a5f920242e2638e3b4f5d9a97 (patch)
treecdc5dea8754f83e128bd4d0e323a1f536e148dfd
parent1752bb48e0782633b7755b86b49234ec1c0acaf0 (diff)
Moves rdo images URL to a new location for opnfv
Change-Id: I4e16b4a4432c935715f0522956614c891a695f70 Signed-off-by: Tim Rozet <trozet@redhat.com>
-rwxr-xr-xbuild/instack.sh6
-rwxr-xr-xci/deploy.sh4
2 files changed, 7 insertions, 3 deletions
diff --git a/build/instack.sh b/build/instack.sh
index 39ab9b0..b4657e2 100755
--- a/build/instack.sh
+++ b/build/instack.sh
@@ -2,7 +2,7 @@
set -e
declare -i CNT
-rdo_images_uri=https://ci.centos.org/artifacts/rdo/images/liberty/delorean/stable
+rdo_images_uri=https://repos.fedorapeople.org/repos/openstack-m/rdo-images-centos-liberty-opnfv
vm_index=4
RDO_RELEASE=liberty
@@ -104,11 +104,13 @@ if [ -z "$UNDERCLOUD" ]; then
#if not found then dnsmasq may be using leasefile-ro
instack_mac=$(ssh -T ${SSH_OPTIONS[@]} stack@localhost "virsh domiflist instack" | grep default | \
grep -Eo "[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+")
- UNDERCLOUD=$(arp -e | grep ${instack_mac} | awk {'print $1'})
+ UNDERCLOUD=$(/usr/sbin/arp -e | grep ${instack_mac} | awk {'print $1'})
if [ -z "$UNDERCLOUD" ]; then
echo "\n\nNever got IP for Instack. Can Not Continue."
exit 1
+ else
+ echo -e "${blue}\rInstack VM has IP $UNDERCLOUD${reset}"
fi
else
echo -e "${blue}\rInstack VM has IP $UNDERCLOUD${reset}"
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 118c763..01bf003 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -508,11 +508,13 @@ function setup_instack_vm {
#if not found then dnsmasq may be using leasefile-ro
instack_mac=$(virsh domiflist instack | grep default | \
grep -Eo "[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+")
- UNDERCLOUD=$(arp -e | grep ${instack_mac} | awk {'print $1'})
+ UNDERCLOUD=$(/usr/sbin/arp -e | grep ${instack_mac} | awk {'print $1'})
if [ -z "$UNDERCLOUD" ]; then
echo "\n\nNever got IP for Instack. Can Not Continue."
exit 1
+ else
+ echo -e "${blue}\rInstack VM has IP $UNDERCLOUD${reset}"
fi
else
echo -e "${blue}\rInstack VM has IP $UNDERCLOUD${reset}"