From 194f9d17226895a67422ae749f6870752030b92d Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 17 Nov 2014 17:50:23 -0500 Subject: nova: update configuration settings The following nova commit: commit 5cacad3508570ce70b1f9ef620e0508169687fda Author: Gary Kotton Date: Tue Jun 3 03:44:40 2014 -0700 Deprecate neutron_* configuration settings Create a new section in the configuration file called 'neutron'. Move all of the neutron_* configuration settings to this section. DocImpact The table below has the changes: +---------------------------------+-------------------------+ | 'DEFAULT' Section | 'neutron' Section | |---------------------------------|-------------------------| | neutron_url | url | | neutron_url_timeout | url_timeout | | neutron_admin_username | admin_username | | neutron_admin_password | admin_password | | neutron_admin_tenant_id | admin_tenant_id | | neutron_admin_tenant_name | admin_tenant_name | | neutron_region_name | region_name | | neutron_admin_auth_url | admin_auth_url | | neutron_api_insecure | api_insecure | | neutron_auth_strategy | auth_strategy | | neutron_region_name | region_name | | neutron_ovs_bridge | ovs_bridge | | neutron_extension_sync_interval | extension_sync_interval | | neutron_ca_certificates_file | ca_certificates_file | +---------------------------------+-----------------------=-+ Means that we need to create a [neturon] section, move and rename our configs appropriately. Signed-off-by: Bruce Ashfield --- .../recipes-devtools/python/python-nova/nova.conf | 21 +++++++++++---------- 1 file 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 f484528..fe4d756 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 + -- cgit v1.2.3-54-g00ecf