summaryrefslogtreecommitdiff
path: root/openstack
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2014-12-17 17:57:04 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-01-22 12:46:28 +0000
commitd8e1bb96e14725f3564773c23a3019c2fdfaca7c (patch)
tree68d5f083218c375e5d11ac006ae7a360a08a87ad /openstack
parent4fd3e86f3e6edb3d2cfcf551a93f75cd3739e0ef (diff)
downloaddefinitions-d8e1bb96e14725f3564773c23a3019c2fdfaca7c.tar.gz
Fix neutron configuration on nova.conf
Diffstat (limited to 'openstack')
-rw-r--r--openstack/etc/nova/nova.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/openstack/etc/nova/nova.conf b/openstack/etc/nova/nova.conf
index 0bebf42e..03ce8dbb 100644
--- a/openstack/etc/nova/nova.conf
+++ b/openstack/etc/nova/nova.conf
@@ -281,8 +281,8 @@ flat_interface=eth0
# Neutron #
###########
# This is the URL of your neutron server:
-neutron_url=##NOVA_INTERNAL_URL##
-#neutron_auth_strategy=keystone
+neutron_url=http://127.0.0.1:9696
+neutron_auth_strategy=keystone
neutron_admin_tenant_name=admin
neutron_admin_username=##NOVA_SERVICE_USER##
neutron_admin_password=##NOVA_SERVICE_PASSWORD##