summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-02-16 13:48:52 -0500
committerDan Radez <dradez@redhat.com>2016-02-17 02:18:11 +0000
commit06f9f5744da21b362d07ff005b4d297d79b74494 (patch)
tree892b1497335fff3811d45ee61318ca33b43ced17
parent203b37043e62e2ac69fd6f8cdae8ab8941f0e056 (diff)
external network creation fix
Change-Id: I618a6d6e762a464751d61c070571df400a3c8eda cherry-picked from: 53122093b40ad3c53a83cc1595b0a2afe6c79378
-rwxr-xr-xci/deploy.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 31b5d2f..f7b30a1 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -951,10 +951,9 @@ function configure_post_install {
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
source overcloudrc
set -o errexit
-service_tenant_id="\$(keystone tenant-get service | grep id | awk '{ print \$4 }')"
echo "Configuring Neutron external network"
-neutron net-create external --router:external=True --tenant-id \$service_tenant_id
-neutron subnet-create --name external-net --tenant-id \$service_tenant_id --disable-dhcp external --gateway ${public_network_gateway} --allocation-pool start=${public_network_floating_ip_range%%,*},end=${public_network_floating_ip_range##*,} ${public_network_cidr}
+neutron net-create external --router:external=True --tenant-id \$(keystone tenant-get service | grep id | awk '{ print \$4 }')
+neutron subnet-create --name external-net --tenant-id \$(keystone tenant-get service | grep id | awk '{ print \$4 }') --disable-dhcp external --gateway ${public_network_gateway} --allocation-pool start=${public_network_floating_ip_range%%,*},end=${public_network_floating_ip_range##*,} ${public_network_cidr}
EOI
echo -e "${blue}INFO: Checking if OVS bridges have IP addresses...${reset}"
@@ -1035,8 +1034,7 @@ done
# Print out the dashboard URL
source stackrc
-publicvip=\$(heat output-show overcloud PublicVip | sed 's/"//g')
-echo "Overcloud dashboard available at http://\$publicvip/dashboard"
+echo "Overcloud dashboard available at http://\$(heat output-show overcloud PublicVip | sed 's/"//g')/dashboard"
EOI
}