summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/python/python-nova
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-11-03 23:16:31 -0500
committerBruce Ashfield <bruce.ashfield@windriver.com>2013-11-25 15:25:35 -0500
commit997c01f64397c56e54711d030efaf40d8547ea3a (patch)
tree76e33dfe03fa799e11f0a78d0a22af998352ca20 /meta-openstack/recipes-devtools/python/python-nova
parent7515039d82076bf0d00f5c545cf7d1a02052a8d6 (diff)
downloadmeta-cloud-services-997c01f64397c56e54711d030efaf40d8547ea3a.tar.gz
nova: rename quantum configuration references to neutron
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-nova')
-rw-r--r--meta-openstack/recipes-devtools/python/python-nova/nova.conf16
1 files changed, 8 insertions, 8 deletions
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
44rabbit_host = %CONTROLLER_IP% 44rabbit_host = %CONTROLLER_IP%
45rabbit_port = 5672 45rabbit_port = 5672
46 46
47#Quantum 47# Neutron
48quantum_url=http://%CONTROLLER_IP%:9696 48neutron_url=http://%CONTROLLER_IP%:9696
49network_api_class=nova.network.quantumv2.api.API 49network_api_class=nova.network.neutronv2.api.API
50quantum_auth_strategy=keystone 50neutron_auth_strategy=keystone
51quantum_admin_tenant_name=service 51neutron_admin_tenant_name=service
52quantum_admin_username=quantum 52neutron_admin_username=neutron
53quantum_admin_password=password 53neutron_admin_password=password
54quantum_admin_auth_url=http://%CONTROLLER_IP%:5000/v2.0/ 54neutron_admin_auth_url=http://%CONTROLLER_IP%:5000/v2.0/
55 55