Code Review
/
apex.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Parameterizes ODL version to deploy options
[apex.git]
/
lib
/
installer
/
onos
/
onos_gw_mac_update.sh
diff --git
a/lib/installer/onos/onos_gw_mac_update.sh
b/lib/installer/onos/onos_gw_mac_update.sh
index
323021d
..
93e63c8
100644
(file)
--- a/
lib/installer/onos/onos_gw_mac_update.sh
+++ b/
lib/installer/onos/onos_gw_mac_update.sh
@@
-21,9
+21,9
@@
function onos_update_gw_mac {
if [ -z "$UNDERCLOUD" ]; then
#if not found then dnsmasq may be using leasefile-ro
if [ -z "$UNDERCLOUD" ]; then
#if not found then dnsmasq may be using leasefile-ro
-
instack_mac=$(virsh domiflist instack
| grep default | \
+
undercloud_mac=$(virsh domiflist undercloud
| grep default | \
grep -Eo "[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+")
grep -Eo "[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+:[0-9a-f\]+")
- UNDERCLOUD=$(/usr/sbin/arp -e | grep ${
instack
_mac} | awk {'print $1'})
+ UNDERCLOUD=$(/usr/sbin/arp -e | grep ${
undercloud
_mac} | awk {'print $1'})
fi
# get controller ip address
controller_ip=$(ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
fi
# get controller ip address
controller_ip=$(ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI