aboutsummaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/python/python-nova/nova.conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-nova/nova.conf')
-rw-r--r--meta-openstack/recipes-devtools/python/python-nova/nova.conf21
1 files changed, 11 insertions, 10 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova.conf b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
index f484528a..fe4d756b 100644
--- a/meta-openstack/recipes-devtools/python/python-nova/nova.conf
+++ b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
@@ -35,6 +35,7 @@ network_manager = nova.network.manager.FlatDHCPManager
fixed_range=
force_dhcp_release=False
dhcpbridge=/usr/bin/nova-dhcpbridge
+network_api_class=nova.network.neutronv2.api.API
#Database configuration
sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@%CONTROLLER_IP%/nova
@@ -44,15 +45,6 @@ rpc_backend = nova.rpc.impl_kombu
rabbit_host = %CONTROLLER_IP%
rabbit_port = 5672
-# 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%:8081/keystone/main/v2.0
-
# Disables reporting of network state to the controller
vif_plugging_timeout=10
vif_plugging_is_fatal=False
@@ -84,7 +76,6 @@ keymap=en-us
server_listen=%COMPUTE_IP%
server_proxyclient_address=%COMPUTE_IP%
-auth_strategy=keystone
[keystone_authtoken]
identity_uri=http://127.0.0.1:8081/keystone/admin
admin_tenant_name = %SERVICE_TENANT_NAME%
@@ -95,3 +86,13 @@ admin_password = %SERVICE_PASSWORD%
virt_type = kvm
libvirt_cpu_mode = none
libvirt_images_type = %LIBVIRT_IMAGES_TYPE%
+
+[neutron]
+# Neutron
+url=http://%CONTROLLER_IP%:9696
+auth_strategy=keystone
+admin_tenant_name=service
+admin_username=neutron
+admin_password=password
+admin_auth_url=http://%CONTROLLER_IP%:8081/keystone/main/v2.0
+