diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-02-09 15:35:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-02-09 15:35:50 +0000 |
| commit | be874c09eea937537ed6b1248d8145521f10807e (patch) | |
| tree | 7b412f1fde98733d1dc6d0ef87ef3429bedbee64 | |
| parent | 404defbb8bb4591a75e876c515872bc2451ca530 (diff) | |
| parent | 7d42556e112c2993b32d6bbb93b3955f4d6cc78c (diff) | |
Merge "Move external net into service tenant"
| -rwxr-xr-x | ci/deploy.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 2e3bea71..87787888 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -932,9 +932,10 @@ function configure_post_install { ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI source overcloudrc set -o errexit +service_tenant_id=$(keystone tenant-get service 2>/dev/null | grep id | cut -d '|' -f 3) echo "Configuring Neutron external network" -neutron net-create external --router:external=True -neutron subnet-create --name external-net --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 $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} EOI echo -e "${blue}INFO: Checking if OVS bridges have IP addresses...${reset}" |