summaryrefslogtreecommitdiff
path: root/openstack/usr/share/openstack/openstack-neutron-setup
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-01-15 16:15:39 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-01-22 12:46:30 +0000
commitf6d23156cdaaeebefa709ed66a41798b1e7af040 (patch)
treee88d8bdc41d9662a9587e800c8bf2ada9bce5477 /openstack/usr/share/openstack/openstack-neutron-setup
parent8c09ab7ce2cfc520bee623f9daa86f7ac46e7443 (diff)
downloaddefinitions-f6d23156cdaaeebefa709ed66a41798b1e7af040.tar.gz
FIXUPME Fix nova_admin_tenant_id in neutron.conf
Diffstat (limited to 'openstack/usr/share/openstack/openstack-neutron-setup')
-rw-r--r--openstack/usr/share/openstack/openstack-neutron-setup4
1 files changed, 4 insertions, 0 deletions
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