From 8bd2caba5bbd5837e68930985d69b83e562f5883 Mon Sep 17 00:00:00 2001 From: LingxianKong Date: Tue, 2 Jun 2015 15:48:48 +0800 Subject: [PATCH] Remove deprecated neutron_* configuration settings neutron_* configuration settings have been deprecated since Juno release, new items in [neutron] section should be referenced in doc. Change-Id: I930a5ee0d08c8832a1a738e1554c1e534eff1c56 Closes-Bug: #1460949 --- .../section_networking-config-identity.xml | 44 ++++++++++--------- .../section_networking-multi-dhcp-agents.xml | 15 ++++--- .../compute/section_hypervisor_hyper-v.xml | 13 +++--- 3 files changed, 38 insertions(+), 34 deletions(-) diff --git a/doc/admin-guide-cloud/networking/section_networking-config-identity.xml b/doc/admin-guide-cloud/networking/section_networking-config-identity.xml index 825e90ae4d..ce27dc70cf 100644 --- a/doc/admin-guide-cloud/networking/section_networking-config-identity.xml +++ b/doc/admin-guide-cloud/networking/section_networking-config-identity.xml @@ -149,7 +149,7 @@ catalog.$Region.network.name = Network Service - network_api_class + [DEFAULT] network_api_class Modify from the default to nova.network.neutronv2.api.API, to @@ -159,40 +159,40 @@ catalog.$Region.network.name = Network Service - neutron_url + [neutron] url Update to the hostname/IP and port of the neutron-server instance for this deployment. - neutron_auth_strategy + [neutron] auth_strategy Keep the default keystone value for all production deployments. - neutron_admin_tenant_name + [neutron] admin_tenant_name Update to the name of the service tenant created in the above section on Identity configuration. - neutron_admin_username + [neutron] admin_username Update to the name of the user created in the above section on Identity configuration. - neutron_admin_password + [neutron] admin_password Update to the password of the user created in the above section on Identity configuration. - neutron_admin_auth_url + [neutron] admin_auth_url Update to the Identity server IP and port. This is the Identity (keystone) admin API server IP and port @@ -246,7 +246,8 @@ catalog.$Region.network.name = Network Service nova-api, even when the requests are made from isolated networks, or from multiple networks that use overlapping IP addresses. To enable proxying the requests, you must update the - following fields in nova.conf. + following fields in [neutron] section in + nova.conf. @@ -259,7 +260,7 @@ catalog.$Region.network.name = Network Service - -
nova.conf metadata settings
service_neutron_metadata_proxy + service_metadata_proxy Update to true, otherwise nova-api will @@ -268,7 +269,7 @@ catalog.$Region.network.name = Network Service
neutron_metadata_proxy_shared_secret + metadata_proxy_shared_secret Update to a string "password" value. You must also configure the same value in the @@ -284,7 +285,7 @@ catalog.$Region.network.name = Network Service
As a precaution, even when using - neutron_metadata_proxy_shared_secret, it + metadata_proxy_shared_secret, it is recommended that you do not expose metadata using the same nova-api instances that are used for tenants. Instead, you should run a dedicated @@ -303,19 +304,20 @@ catalog.$Region.network.name = Network Service >nova-api) Example values for the above settings, assuming a cloud controller node running Compute and Networking with an IP address of 192.168.1.2: -network_api_class=nova.network.neutronv2.api.API -neutron_url=http://192.168.1.2:9696 -neutron_auth_strategy=keystone -neutron_admin_tenant_name=service -neutron_admin_username=neutron -neutron_admin_password=password -neutron_admin_auth_url=http://192.168.1.2:35357/v2.0 - +[DEFAULT] security_group_api=neutron +network_api_class=nova.network.neutronv2.api.API firewall_driver=nova.virt.firewall.NoopFirewallDriver -service_neutron_metadata_proxy=true -neutron_metadata_proxy_shared_secret=foo +[neutron] +url=http://192.168.1.2:9696 +auth_strategy=keystone +admin_tenant_name=service +admin_username=neutron +admin_password=password +admin_auth_url=http://192.168.1.2:35357/v2.0 +service_metadata_proxy=true +metadata_proxy_shared_secret=foo diff --git a/doc/admin-guide-cloud/networking/section_networking-multi-dhcp-agents.xml b/doc/admin-guide-cloud/networking/section_networking-multi-dhcp-agents.xml index 099ffcf28a..09f6976d8b 100644 --- a/doc/admin-guide-cloud/networking/section_networking-multi-dhcp-agents.xml +++ b/doc/admin-guide-cloud/networking/section_networking-multi-dhcp-agents.xml @@ -123,14 +123,15 @@ physical_interface_mappings = physnet1:eth0 /etc/nova/nova.conf: [DEFAULT] network_api_class=nova.network.neutronv2.api.API +firewall_driver=nova.virt.firewall.NoopFirewallDriver -neutron_admin_username=neutron -neutron_admin_password=servicepassword -neutron_admin_auth_url=http://controlnode:35357/v2.0/ -neutron_auth_strategy=keystone -neutron_admin_tenant_name=servicetenant -neutron_url=http://100.1.1.10:9696/ -firewall_driver=nova.virt.firewall.NoopFirewallDriver +[neutron] +admin_username=neutron +admin_password=servicepassword +admin_auth_url=http://controlnode:35357/v2.0/ +auth_strategy=keystone +admin_tenant_name=servicetenant +url=http://100.1.1.10:9696/ diff --git a/doc/config-reference/compute/section_hypervisor_hyper-v.xml b/doc/config-reference/compute/section_hypervisor_hyper-v.xml index b9bedcf9cd..b3d91f5ec1 100644 --- a/doc/config-reference/compute/section_hypervisor_hyper-v.xml +++ b/doc/config-reference/compute/section_hypervisor_hyper-v.xml @@ -380,12 +380,13 @@ logfile = nova-compute.log instance_usage_audit = true instance_usage_audit_period = hour network_api_class = nova.network.neutronv2.api.API -neutron_url = http://IP_ADDRESS:9696 -neutron_auth_strategy = keystone -neutron_admin_tenant_name = service -neutron_admin_username = neutron -neutron_admin_password = Passw0rd -neutron_admin_auth_url = http://IP_ADDRESS:35357/v2.0 +[neutron] +url = http://IP_ADDRESS:9696 +auth_strategy = keystone +admin_tenant_name = service +admin_username = neutron +admin_password = Passw0rd +admin_auth_url = http://IP_ADDRESS:35357/v2.0 [hyperv] vswitch_name = newVSwitch0 limit_cpu_features = false