summaryrefslogtreecommitdiff
path: root/openstack
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2014-12-18 10:25:25 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-01-22 12:46:29 +0000
commit8ccb453d1d1fbcec52e1b8e510d0c4feec713691 (patch)
tree7358eeb2590165a02cefdbbe339dd666bdf8d1a1 /openstack
parent24900731c793c27ce92016627329dd79269583d1 (diff)
downloaddefinitions-8ccb453d1d1fbcec52e1b8e510d0c4feec713691.tar.gz
Fix neutron configuration in nova conf
Diffstat (limited to 'openstack')
-rw-r--r--openstack/etc/nova/nova.conf10
1 files changed, 5 insertions, 5 deletions
diff --git a/openstack/etc/nova/nova.conf b/openstack/etc/nova/nova.conf
index 03ce8dbb..f1b3948b 100644
--- a/openstack/etc/nova/nova.conf
+++ b/openstack/etc/nova/nova.conf
@@ -281,13 +281,13 @@ flat_interface=eth0
# Neutron #
###########
# This is the URL of your neutron server:
-neutron_url=http://127.0.0.1:9696
+neutron_url=##NEUTRON_PUBLIC_URL##
neutron_auth_strategy=keystone
-neutron_admin_tenant_name=admin
-neutron_admin_username=##NOVA_SERVICE_USER##
-neutron_admin_password=##NOVA_SERVICE_PASSWORD##
+neutron_admin_tenant_name=service
+neutron_admin_username=##NEUTRON_SERVICE_USER##
+neutron_admin_password=##NEUTRON_SERVICE_PASSWORD##
# This is the URL of your Keystone server
-neutron_admin_auth_url=http://127.0.0.1:35357/v2.0
+neutron_admin_auth_url=##KEYSTONE_ADMIN_URL##
# What's below is only needed for nova-compute.