diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-01-15 16:15:39 +0000 |
|---|---|---|
| committer | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-01-22 12:46:30 +0000 |
| commit | f6d23156cdaaeebefa709ed66a41798b1e7af040 (patch) | |
| tree | e88d8bdc41d9662a9587e800c8bf2ada9bce5477 /openstack | |
| parent | 8c09ab7ce2cfc520bee623f9daa86f7ac46e7443 (diff) | |
| download | definitions-f6d23156cdaaeebefa709ed66a41798b1e7af040.tar.gz | |
FIXUPME Fix nova_admin_tenant_id in neutron.conf
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/etc/neutron/neutron.conf | 2 | ||||
| -rw-r--r-- | openstack/usr/share/openstack/openstack-neutron-setup | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/openstack/etc/neutron/neutron.conf b/openstack/etc/neutron/neutron.conf index 03764625..a3290144 100644 --- a/openstack/etc/neutron/neutron.conf +++ b/openstack/etc/neutron/neutron.conf @@ -252,7 +252,7 @@ nova_url = http://localhost:8774/v2 nova_admin_username = ##NOVA_SERVICE_USER## # The uuid of the admin nova tenant -nova_admin_tenant_id = service +nova_admin_tenant_id = ##SERVICE_TENANT_ID## # Password for connection to nova in admin context. nova_admin_password = ##NOVA_SERVICE_PASSWORD## 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 |