diff options
| -rwxr-xr-x | ci/deploy.sh | 1 | ||||
| -rw-r--r-- | lib/common-functions.sh | 84 |
2 files changed, 46 insertions, 39 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 7dc42012..9d5d9d28 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -591,6 +591,7 @@ function configure_network_environment { sed -i '/ExternalNetCidr/c\\ ExternalNetCidr: '${public_network_cidr}'' $1 sed -i "/ExternalAllocationPools/c\\ ExternalAllocationPools: [{'start': '${public_network_usable_ip_range%%,*}', 'end': '${public_network_usable_ip_range##*,}'}]" $1 sed -i '/ExternalInterfaceDefaultRoute/c\\ ExternalInterfaceDefaultRoute: '${public_network_gateway}'' $1 + sed -i '/EC2MetadataIp/c\\ EC2MetadataIp: '${admin_network_provisioner_ip}'' $1 } ##Copy over the glance images and instack json file ##params: none diff --git a/lib/common-functions.sh b/lib/common-functions.sh index 055d7fa2..6738ddf4 100644 --- a/lib/common-functions.sh +++ b/lib/common-functions.sh @@ -353,35 +353,38 @@ function attach_interface_to_ovs { # move old config file to .orig mv -f ${if_file} ${if_file}.orig - echo "DEVICE=${interface}, -TYPE=OVSPort, -PEERDNS=no, -BOOTPROTO=static, -NM_CONTROLLED=no, -ONBOOT=yes, -OVS_BRIDGE=${bridge}, + echo "DEVICE=${interface} +DEVICETYPE=ovs +TYPE=OVSPort +PEERDNS=no +BOOTPROTO=static +NM_CONTROLLED=no +ONBOOT=yes +OVS_BRIDGE=${bridge} PROMISC=yes" > ${if_file} if [ -z ${if_gw} ]; then # create bridge cfg - echo "DEVICE=${bridge}, -IPADDR=${if_ip}, -NETMASK=${if_mask}, -BOOTPROTO=static, -ONBOOT=yes, -TYPE=OVSBridge, -PROMISC=yes, + echo "DEVICE=${bridge} +DEVICETYPE=ovs +IPADDR=${if_ip} +NETMASK=${if_mask} +BOOTPROTO=static +ONBOOT=yes +TYPE=OVSBridge +PROMISC=yes PEERDNS=no" > ${ovs_file} else - echo "DEVICE=${bridge}, -IPADDR=${if_ip}, -NETMASK=${if_mask}, -BOOTPROTO=static, -ONBOOT=yes, -TYPE=OVSBridge, -PROMISC=yes, -GATEWAY=${if_gw}, + echo "DEVICE=${bridge} +DEVICETYPE=ovs +IPADDR=${if_ip} +NETMASK=${if_mask} +BOOTPROTO=static +ONBOOT=yes +TYPE=OVSBridge +PROMISC=yes +GATEWAY=${if_gw} PEERDNS=no" > ${ovs_file} fi @@ -428,23 +431,23 @@ function detach_interface_from_ovs { if [ -z ${if_gw} ]; then # create if cfg - echo "DEVICE=${line}, -IPADDR=${if_ip}, -NETMASK=${if_mask}, -BOOTPROTO=static, -ONBOOT=yes, -TYPE=Ethernet, -NM_CONTROLLED=no, + echo "DEVICE=${line} +IPADDR=${if_ip} +NETMASK=${if_mask} +BOOTPROTO=static +ONBOOT=yes +TYPE=Ethernet +NM_CONTROLLED=no PEERDNS=no" > ${net_path}/ifcfg-${line} else - echo "DEVICE=${line}, -IPADDR=${if_ip}, -NETMASK=${if_mask}, -BOOTPROTO=static, -ONBOOT=yes, -TYPE=Ethernet, -NM_CONTROLLED=no, -GATEWAY=${if_gw}, + echo "DEVICE=${line} +IPADDR=${if_ip} +NETMASK=${if_mask} +BOOTPROTO=static +ONBOOT=yes +TYPE=Ethernet +NM_CONTROLLED=no +GATEWAY=${if_gw} PEERDNS=no" > ${net_path}/ifcfg-${line} fi break @@ -455,8 +458,11 @@ PEERDNS=no" > ${net_path}/ifcfg-${line} done <<< "$port_output" - # now remove the bridge ifcfg file - rm -f ${net_path}/ifcfg-${bridge} + # modify the bridge ifcfg file + # to remove IP params + sudo sed -i 's/IPADDR=.*//' ${net_path}/ifcfg-${bridge} + sudo sed -i 's/NETMASK=.*//' ${net_path}/ifcfg-${bridge} + sudo sed -i 's/GATEWAY=.*//' ${net_path}/ifcfg-${bridge} sudo systemctl restart network } |