summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorMichael Chapman <michapma@redhat.com>2016-02-16 23:59:33 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-02-16 23:59:33 +0000
commit2dae8a5767161e194a19dc85065b4aa6013a1db2 (patch)
tree0d07ab4dc763388a3d322ec875ff56c03e606b3d /ci
parente510935cc62c8fc3b9e2d9cf5f76fb5e1b0a1895 (diff)
parent53122093b40ad3c53a83cc1595b0a2afe6c79378 (diff)
Merge "external network creation fix"
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 31b5d2f5..f7b30a1e 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
}