openstack/openstack-manuals
Code Issues Proposed changes

Remove deprecated neutron_* configuration settings

Browse Source 
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
This commit is contained in:
LingxianKong 2015-06-02 15:48:48 +08:00
parent a057b3037a
commit 8bd2caba5b
3 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
doc/admin-guide-cloud/networking/section_networking-config-identity.xml
View File

@ -149,7 +149,7 @@ catalog.$Region.network.name = Network Service</programlisting>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td><para><literal>network_api_class</literal></para></td> <td><para><literal>[DEFAULT] network_api_class</literal></para></td>
<td> <td>
<para>Modify from the default to <para>Modify from the default to
<literal>nova.network.neutronv2.api.API</literal>, to <literal>nova.network.neutronv2.api.API</literal>, to
@ -159,40 +159,40 @@ catalog.$Region.network.name = Network Service</programlisting>
</td> </td>
</tr> </tr>
<tr> <tr>
<td><para><literal>neutron_url</literal></para></td> <td><para><literal>[neutron] url</literal></para></td>
<td><para>Update to the hostname/IP and port of the <td><para>Update to the hostname/IP and port of the
<systemitem class="service" <systemitem class="service"
>neutron-server</systemitem> instance for this >neutron-server</systemitem> instance for this
deployment.</para></td> deployment.</para></td>
</tr> </tr>
<tr> <tr>
<td><para><literal>neutron_auth_strategy</literal></para></td> <td><para><literal>[neutron] auth_strategy</literal></para></td>
<td><para>Keep the default <literal>keystone</literal> value <td><para>Keep the default <literal>keystone</literal> value
for all production deployments.</para></td> for all production deployments.</para></td>
</tr> </tr>
<tr> <tr>
<td><para><literal>neutron_admin_tenant_name</literal></para></td> <td><para><literal>[neutron] admin_tenant_name</literal></para></td>
<td> <td>
<para>Update to the name of the service tenant created in <para>Update to the name of the service tenant created in
the above section on Identity configuration.</para> the above section on Identity configuration.</para>
</td> </td>
</tr> </tr>
<tr> <tr>
<td><para><literal>neutron_admin_username</literal></para></td> <td><para><literal>[neutron] admin_username</literal></para></td>
<td> <td>
<para>Update to the name of the user created in the above <para>Update to the name of the user created in the above
section on Identity configuration.</para> section on Identity configuration.</para>
</td> </td>
</tr> </tr>
<tr> <tr>
<td><para><literal>neutron_admin_password</literal></para></td> <td><para><literal>[neutron] admin_password</literal></para></td>
<td> <td>
<para>Update to the password of the user created in the <para>Update to the password of the user created in the
above section on Identity configuration.</para> above section on Identity configuration.</para>
</td> </td>
</tr> </tr>
<tr> <tr>
<td><para><literal>neutron_admin_auth_url</literal></para></td> <td><para><literal>[neutron] admin_auth_url</literal></para></td>
<td> <td>
<para>Update to the Identity server IP and port. This is <para>Update to the Identity server IP and port. This is
the Identity (keystone) admin API server IP and port the Identity (keystone) admin API server IP and port
@ -246,7 +246,8 @@ catalog.$Region.network.name = Network Service</programlisting>
<systemitem class="service">nova-api</systemitem>, even when the requests are made from <systemitem class="service">nova-api</systemitem>, even when the requests are made from
isolated networks, or from multiple networks that use overlapping IP addresses.</para> isolated networks, or from multiple networks that use overlapping IP addresses.</para>
<para>To enable proxying the requests, you must update the <para>To enable proxying the requests, you must update the
following fields in <filename>nova.conf</filename>.</para> following fields in <literal>[neutron]</literal> section in
<filename>nova.conf</filename>.</para>
<table rules="all"> <table rules="all">
<caption>nova.conf metadata settings</caption> <caption>nova.conf metadata settings</caption>
<col width="45%"/> <col width="45%"/>
@ -259,7 +260,7 @@ catalog.$Region.network.name = Network Service</programlisting>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td><para><literal>service_neutron_metadata_proxy</literal> <td><para><literal>service_metadata_proxy</literal>
</para></td> </para></td>
<td><para>Update to <literal>true</literal>, otherwise <td><para>Update to <literal>true</literal>, otherwise
<systemitem class="service">nova-api</systemitem> will <systemitem class="service">nova-api</systemitem> will
@ -268,7 +269,7 @@ catalog.$Region.network.name = Network Service</programlisting>
</para></td> </para></td>
</tr> </tr>
<tr> <tr>
<td><para><literal>neutron_metadata_proxy_shared_secret</literal> <td><para><literal>metadata_proxy_shared_secret</literal>
</para></td> </para></td>
<td><para>Update to a string "password" value. You must also <td><para>Update to a string "password" value. You must also
configure the same value in the configure the same value in the
@ -284,7 +285,7 @@ catalog.$Region.network.name = Network Service</programlisting>
</table> </table>
<note> <note>
<para>As a precaution, even when using <para>As a precaution, even when using
<literal>neutron_metadata_proxy_shared_secret</literal>, it <literal>metadata_proxy_shared_secret</literal>, it
is recommended that you do not expose metadata using the same is recommended that you do not expose metadata using the same
<systemitem class="service">nova-api</systemitem> instances <systemitem class="service">nova-api</systemitem> instances
that are used for tenants. Instead, you should run a dedicated that are used for tenants. Instead, you should run a dedicated
@ -303,19 +304,20 @@ catalog.$Region.network.name = Network Service</programlisting>
>nova-api</systemitem>)</title> >nova-api</systemitem>)</title>
<para>Example values for the above settings, assuming a cloud controller node running Compute <para>Example values for the above settings, assuming a cloud controller node running Compute
and Networking with an IP address of 192.168.1.2:</para> and Networking with an IP address of 192.168.1.2:</para>
<programlisting language="ini">network_api_class=nova.network.neutronv2.api.API <programlisting language="ini">[DEFAULT]
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
security_group_api=neutron security_group_api=neutron
network_api_class=nova.network.neutronv2.api.API
firewall_driver=nova.virt.firewall.NoopFirewallDriver firewall_driver=nova.virt.firewall.NoopFirewallDriver
service_neutron_metadata_proxy=true [neutron]
neutron_metadata_proxy_shared_secret=foo 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
</programlisting> </programlisting>
</section> </section>
</section> </section>

15
doc/admin-guide-cloud/networking/section_networking-multi-dhcp-agents.xml
View File

@ -123,14 +123,15 @@ physical_interface_mappings = physnet1:eth0</programlisting>
<filename>/etc/nova/nova.conf</filename>:</para> <filename>/etc/nova/nova.conf</filename>:</para>
<programlisting language="ini">[DEFAULT] <programlisting language="ini">[DEFAULT]
network_api_class=nova.network.neutronv2.api.API network_api_class=nova.network.neutronv2.api.API
firewall_driver=nova.virt.firewall.NoopFirewallDriver
neutron_admin_username=neutron [neutron]
neutron_admin_password=servicepassword admin_username=neutron
neutron_admin_auth_url=http://controlnode:35357/v2.0/ admin_password=servicepassword
neutron_auth_strategy=keystone admin_auth_url=http://controlnode:35357/v2.0/
neutron_admin_tenant_name=servicetenant auth_strategy=keystone
neutron_url=http://100.1.1.10:9696/ admin_tenant_name=servicetenant
firewall_driver=nova.virt.firewall.NoopFirewallDriver</programlisting> url=http://100.1.1.10:9696/</programlisting>
</step> </step>
</procedure> </procedure>
<procedure> <procedure>

13
doc/config-reference/compute/section_hypervisor_hyper-v.xml
View File

@ -380,12 +380,13 @@ logfile = nova-compute.log
instance_usage_audit = true instance_usage_audit = true
instance_usage_audit_period = hour instance_usage_audit_period = hour
network_api_class = nova.network.neutronv2.api.API network_api_class = nova.network.neutronv2.api.API
neutron_url = http://<replaceable>IP_ADDRESS</replaceable>:9696 [neutron]
neutron_auth_strategy = keystone url = http://<replaceable>IP_ADDRESS</replaceable>:9696
neutron_admin_tenant_name = service auth_strategy = keystone
neutron_admin_username = neutron admin_tenant_name = service
neutron_admin_password = Passw0rd admin_username = neutron
neutron_admin_auth_url = http://<replaceable>IP_ADDRESS:35357</replaceable>/v2.0 admin_password = Passw0rd
admin_auth_url = http://<replaceable>IP_ADDRESS:35357</replaceable>/v2.0
[hyperv] [hyperv]
vswitch_name = newVSwitch0 vswitch_name = newVSwitch0
limit_cpu_features = false limit_cpu_features = false