diff options
Diffstat (limited to 'openstack/usr/share/openstack/neutron/neutron.conf')
| -rw-r--r-- | openstack/usr/share/openstack/neutron/neutron.conf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openstack/usr/share/openstack/neutron/neutron.conf b/openstack/usr/share/openstack/neutron/neutron.conf index fea0d476..4608e732 100644 --- a/openstack/usr/share/openstack/neutron/neutron.conf +++ b/openstack/usr/share/openstack/neutron/neutron.conf @@ -246,7 +246,7 @@ notify_nova_on_port_data_changes = True nova_url = http://onenode:8774/v2 # Name of nova region to use. Useful if keystone manages more than one region -nova_region_name = {{ NOVA_REGION }} +nova_region_name = regionOne # Username for connection to nova in admin context nova_admin_username = {{ NOVA_SERVICE_USER }} @@ -258,7 +258,7 @@ nova_admin_tenant_id = {{ SERVICE_TENANT_ID }} nova_admin_password = {{ NOVA_SERVICE_PASSWORD }} # Authorization URL for connection to nova in admin context. -nova_admin_auth_url = {{ KEYSTONE_ADMIN_URL }} +nova_admin_auth_url = http://{{ CONTROLLER_HOST_ADDRESS }}:35357/v2.0 # CA file for novaclient to verify server certificates # nova_ca_certificates_file = @@ -557,8 +557,8 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf # =========== end of items for agent management extension ===== [keystone_authtoken] -auth_uri = {{ KEYSTONE_PUBLIC_URL }} -identity_uri = {{ IDENTITY_URI }} +auth_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0 +identity_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:35357 admin_tenant_name = service admin_user = {{ NEUTRON_SERVICE_USER }} admin_password = {{ NEUTRON_SERVICE_PASSWORD }} |