From 997c01f64397c56e54711d030efaf40d8547ea3a Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sun, 3 Nov 2013 23:16:31 -0500 Subject: nova: rename quantum configuration references to neutron Signed-off-by: Bruce Ashfield --- .../recipes-devtools/python/python-nova/nova.conf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'meta-openstack/recipes-devtools/python/python-nova') diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova.conf b/meta-openstack/recipes-devtools/python/python-nova/nova.conf index 20db54d..97c8f8e 100644 --- a/meta-openstack/recipes-devtools/python/python-nova/nova.conf +++ b/meta-openstack/recipes-devtools/python/python-nova/nova.conf @@ -44,12 +44,12 @@ rpc_backend = nova.rpc.impl_kombu rabbit_host = %CONTROLLER_IP% rabbit_port = 5672 -#Quantum -quantum_url=http://%CONTROLLER_IP%:9696 -network_api_class=nova.network.quantumv2.api.API -quantum_auth_strategy=keystone -quantum_admin_tenant_name=service -quantum_admin_username=quantum -quantum_admin_password=password -quantum_admin_auth_url=http://%CONTROLLER_IP%:5000/v2.0/ +# Neutron +neutron_url=http://%CONTROLLER_IP%:9696 +network_api_class=nova.network.neutronv2.api.API +neutron_auth_strategy=keystone +neutron_admin_tenant_name=service +neutron_admin_username=neutron +neutron_admin_password=password +neutron_admin_auth_url=http://%CONTROLLER_IP%:5000/v2.0/ -- cgit v1.2.3-54-g00ecf