From f6d23156cdaaeebefa709ed66a41798b1e7af040 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Thu, 15 Jan 2015 16:15:39 +0000
Subject: FIXUPME Fix nova_admin_tenant_id in neutron.conf

---
 openstack/usr/share/openstack/openstack-neutron-setup | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'openstack/usr/share/openstack')

diff --git a/openstack/usr/share/openstack/openstack-neutron-setup b/openstack/usr/share/openstack/openstack-neutron-setup
index 731bd919..58a6747e 100644
--- a/openstack/usr/share/openstack/openstack-neutron-setup
+++ b/openstack/usr/share/openstack/openstack-neutron-setup
@@ -40,6 +40,10 @@ keystone endpoint-create  --service-id $(keystone service-list | awk '/ network
 	                  --adminurl ##NEUTRON_ADMIN_URL## \
 			  --region regionOne
 
+# neutron.conf configuration
+service_tenant_id=$(keystone tenant-get service | grep id | tr -d " " | cut -d"|" -f3)
+sed -i 's/##SERVICE_TENANT_ID##/$service_tenant_id/g' /etc/neutron/neutron.conf
+
 # Neutron compute configuration
 if [ ! -d /var/run/neutron ]; then
     mkdir -p /var/run/neutron
-- 
cgit v1.2.1