diff options
| author |   Michael Chapman <woppin@gmail.com> | 2016-02-08 16:33:54 +1100 |
|---|---|---|
| committer | Michael Chapman <woppin@gmail.com> | 2016-02-10 12:22:17 +1100 |
| commit | f87aff46ff36b0fa7172dc82d3c2b5766a2eaaf4 (patch) | |
| tree | 6f0c04bd996992565cea9caa824981c7b0575073 /ci | |
| parent | 8a78a2171ab75d63980b3bc387cd5239481fe8de (diff) | |
Move external net into service tenant
Change-Id: I3474118e58ae4946abfe9e74bb73084aad3634b2
JIRA: APEX-88
(cherry picked from commit 7d42556e112c2993b32d6bbb93b3955f4d6cc78c)
Diffstat (limited to 'ci')
| -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}" |