summaryrefslogtreecommitdiff
path: root/openstack
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2014-12-18 10:24:50 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-01-22 12:46:28 +0000
commit24900731c793c27ce92016627329dd79269583d1 (patch)
tree2e00f89982cf0354d0f17cf32e08fbe9ae3d30af /openstack
parent7779888fedad236c162ae867eb4d9782331831aa (diff)
downloaddefinitions-24900731c793c27ce92016627329dd79269583d1.tar.gz
Fix authentication configuration on neutron conf
Diffstat (limited to 'openstack')
-rw-r--r--openstack/etc/neutron/neutron.conf10
1 files changed, 6 insertions, 4 deletions
diff --git a/openstack/etc/neutron/neutron.conf b/openstack/etc/neutron/neutron.conf
index 40c57054..ba10b760 100644
--- a/openstack/etc/neutron/neutron.conf
+++ b/openstack/etc/neutron/neutron.conf
@@ -243,7 +243,7 @@ notify_nova_on_port_status_changes = True
notify_nova_on_port_data_changes = True
# URL for connection to nova (Only supports one nova region currently).
-nova_url = http://127.0.0.1:8774/v2
+nova_url = http://localhost:8774/v2
# Name of nova region to use. Useful if keystone manages more than one region
# nova_region_name =
@@ -557,9 +557,11 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
# =========== end of items for agent management extension =====
[keystone_authtoken]
-auth_host = ##OPENSTACK_AUTH_HOST##
-auth_port = ##OPENSTACK_AUTH_PORT##
-auth_protocol = http
+auth_uri = ##KEYSTONE_PUBLIC_URL##
+identity_uri = http://localhost:35357
+#auth_host = ##OPENSTACK_AUTH_HOST##
+#auth_port = ##OPENSTACK_AUTH_PORT##
+#auth_protocol = http
admin_tenant_name = service
admin_user = ##NEUTRON_SERVICE_USER##
admin_password = ##NEUTRON_SERVICE_PASSWORD##