diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-03-23 14:31:09 -0400 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2016-03-24 21:47:25 -0400 |
| commit | 012f1d08b075ec53d3b1174cfd7a93b246385d08 (patch) | |
| tree | a4ea79ed5356fba2ce5cd417048fece5cd610918 /lib | |
| parent | 5f38edb9a96df7d5927d9b91039144bf4d5f0912 (diff) | |
Renaming Instack to Undercloud
This commit is not backwards compatible with cleaning.
VMs named Instack will need to be manually removed.
Change-Id: I6829119e43a0a572da07e6d9757c5208c7fe91d4
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common-functions.sh | 6 | ||||
| -rw-r--r-- | lib/installer/onos/onos_gw_mac_update.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/common-functions.sh b/lib/common-functions.sh index 0b1eb7d2..af9b7103 100644 --- a/lib/common-functions.sh +++ b/lib/common-functions.sh @@ -212,7 +212,7 @@ function find_usable_ip_range { } ##generates usable IP range in correct format based on CIDR -##assumes the first 20 IPs are used (by instack or otherwise) +##assumes the first 20 IPs are used (by undercloud or otherwise) ##params: cidr function generate_usable_ip_range { local first_ip first_block_ip last_block_ip @@ -231,7 +231,7 @@ function generate_usable_ip_range { fi } -##find the instack IP address +##find the undercloud IP address ##finds first usable IP on subnet ##params: interface function find_provisioner_ip { @@ -246,7 +246,7 @@ function find_provisioner_ip { echo $(increment_ip ${interface_ip} 1) } -##generates instack IP address based on CIDR +##generates undercloud IP address based on CIDR ##params: cidr function generate_provisioner_ip { local provisioner_ip diff --git a/lib/installer/onos/onos_gw_mac_update.sh b/lib/installer/onos/onos_gw_mac_update.sh index 323021db..93e63c8e 100644 --- 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 - 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\]+") - 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 |