summaryrefslogtreecommitdiff
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-02-11 18:30:33 +0000
commit4008fa19953339a488c959f17c72e87159f3564e (patch)
treea280635cb74d4195095af0ce6b3088711626be49
parent5b0d635ec8207774f423c2b9f99d6f8d50e15075 (diff)
downloaddefinitions-4008fa19953339a488c959f17c72e87159f3564e.tar.gz
Fix neutron configuration in nova conf
-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.