From f87aff46ff36b0fa7172dc82d3c2b5766a2eaaf4 Mon Sep 17 00:00:00 2001
From: Michael Chapman <woppin@gmail.com>
Date: Mon, 8 Feb 2016 16:33:54 +1100
Subject: Move external net into service tenant

Change-Id: I3474118e58ae4946abfe9e74bb73084aad3634b2
JIRA: APEX-88
(cherry picked from commit 7d42556e112c2993b32d6bbb93b3955f4d6cc78c)
---
 ci/deploy.sh | 5 +++--
 1 file 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}"
-- 
cgit 1.2.3-korg