From 95c532364a6064eb792dc0e52f136e5f0f5c913b Mon Sep 17 00:00:00 2001
From: liu-sheng <liusheng@huawei.com>
Date: Thu, 3 Jul 2014 16:03:27 +0800
Subject: [PATCH] Use the aliases of plugin in Neutron.conf
The configuration documentation should use the short-hand names
of plugins that is set in setup.cfg instead of forcing admin/operators
to provide a full class path.
Change-Id: Iafb32d79a4615b10ee460d5e38bf9a530d1c1541
Closes-bug: #1332639
---
.../networking/section_networking-adv-config.xml | 6 +++---
.../section_networking-multi-dhcp-agents.xml | 2 +-
.../networking/section_networking_introduction.xml | 14 +++++++-------
.../section_neutron-ovs-compute-node.xml | 4 ++--
.../section_neutron-ovs-controller-node.xml | 2 +-
.../section_neutron-ovs-network-node.xml | 2 +-
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/doc/admin-guide-cloud/networking/section_networking-adv-config.xml b/doc/admin-guide-cloud/networking/section_networking-adv-config.xml
index 9d3ba5ba58..44bc587df8 100644
--- a/doc/admin-guide-cloud/networking/section_networking-adv-config.xml
+++ b/doc/admin-guide-cloud/networking/section_networking-adv-config.xml
@@ -83,7 +83,7 @@ mysql> grant all on <database-name>.* to '<user-name>'@'%';</comp
<tr>
<td>core_plugin
($NEUTRON_CONF_DIR/neutron.conf)</td>
- <td>neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2</td>
+ <td>openvswitch</td>
</tr>
<tr>
<td>connection (in the plugin configuration file,
@@ -106,7 +106,7 @@ mysql> grant all on <database-name>.* to '<user-name>'@'%';</comp
<tr>
<td>core_plugin
($NEUTRON_CONF_DIR/neutron.conf)</td>
- <td>neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2</td>
+ <td>linuxbridge</td>
</tr>
<tr>
<td>connection (in the plug-in configuration file,
@@ -402,7 +402,7 @@ external_network_bridge = br-ex-2</computeroutput></screen>
<para>To enable L3 metering you have to be sure to set the following parameter in
<filename>neutron.conf</filename> on the host that runs
<systemitem class="service">neutron-server</systemitem>:</para>
- <programlisting language="ini">service_plugins = neutron.services.metering.metering_plugin.MeteringPlugin</programlisting>
+ <programlisting language="ini">service_plugins = metering</programlisting>
</section>
</section>
<section xml:id="section_limitations">
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 68b2741b3f..bd4b501507 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
@@ -75,7 +75,7 @@
<para>Neutron configuration file
<filename>/etc/neutron/neutron.conf</filename>:</para>
<programlisting language="ini">[DEFAULT]
-core_plugin = neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2
+core_plugin = linuxbridge
rabbit_host = controlnode
allow_overlapping_ips = True
host = controlnode
diff --git a/doc/admin-guide-cloud/networking/section_networking_introduction.xml b/doc/admin-guide-cloud/networking/section_networking_introduction.xml
index 3236ce254f..82eb8e3989 100644
--- a/doc/admin-guide-cloud/networking/section_networking_introduction.xml
+++ b/doc/admin-guide-cloud/networking/section_networking_introduction.xml
@@ -279,7 +279,7 @@
<step>
<para>Enable the FWaaS plug-in in the
<filename>neutron.conf</filename> file:</para>
- <programlisting language="ini">service_plugins = neutron.services.firewall.fwaas_plugin.FirewallPlugin
+ <programlisting language="ini">service_plugins = firewall
[service_providers]
service_provider=LOADBALANCER:Haproxy:neutron.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
[fwaas]
@@ -661,7 +661,7 @@ enabled = True</programlisting>
<para>Edit the
<filename>/etc/neutron/neutron.conf</filename>
file and add this line:</para>
- <programlisting language="ini">core_plugin = neutron.plugins.bigswitch.plugin.NeutronRestProxyV2</programlisting>
+ <programlisting language="ini">core_plugin = bigswitch</programlisting>
</step>
<step>
<para>Edit the
@@ -710,7 +710,7 @@ enabled = True</programlisting>
<para>Edit the
<filename>/etc/neutron/neutron.conf</filename>
file and set the following option:</para>
- <programlisting language="ini">core_plugin = neutron.plugins.brocade.NeutronPlugin.BrocadePluginV2</programlisting>
+ <programlisting language="ini">core_plugin = brocade</programlisting>
</step>
<step>
<para>Edit the
@@ -1021,7 +1021,7 @@ nsx_controllers=10.127.0.100,10.127.0.200:8888</programlisting>
<para>Edit the
<filename>/etc/neutron/neutron.conf</filename>
file and set this line:</para>
- <programlisting language="ini">core_plugin = neutron.plugins.plumgrid.plumgrid_plugin.plumgrid_plugin.NeutronPluginPLUMgridV2</programlisting>
+ <programlisting language="ini">core_plugin = plumgrid</programlisting>
</step>
<step>
<para>Edit the
@@ -1063,7 +1063,7 @@ password = "PLUMgrid-director-admin-password"</programlisting>
<para>Edit the
<filename>/etc/neutron/neutron.conf</filename>
file and set this line:</para>
- <programlisting language="ini">core_plugin = neutron.plugins.ryu.ryu_neutron_plugin.RyuNeutronPluginV2</programlisting>
+ <programlisting language="ini">core_plugin = ryu</programlisting>
</step>
<step>
<para>Edit the
@@ -1559,7 +1559,7 @@ interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver</programlist
<filename>neutron.conf</filename> file on
the host that runs <systemitem class="service"
>neutron-server</systemitem>:</para>
- <programlisting language="ini">service_plugins = neutron.services.metering.metering_plugin.MeteringPlugin</programlisting>
+ <programlisting language="ini">service_plugins = metering</programlisting>
</step>
</procedure>
</section>
@@ -1592,7 +1592,7 @@ interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver</programlist
<option>service_plugin</option> in the
<filename>/etc/neutron/neutron.conf</filename>
file:</para>
- <programlisting language="ini">service_plugins = neutron.services.loadbalancer.plugin.LoadBalancerPlugin</programlisting>
+ <programlisting language="ini">service_plugins = lbaas</programlisting>
</step>
<step>
<para>Enable the
diff --git a/doc/install-guide/section_neutron-ovs-compute-node.xml b/doc/install-guide/section_neutron-ovs-compute-node.xml
index bec0c368a0..ba58713edd 100644
--- a/doc/install-guide/section_neutron-ovs-compute-node.xml
+++ b/doc/install-guide/section_neutron-ovs-compute-node.xml
@@ -76,8 +76,8 @@ net.ipv4.conf.default.rp_filter=0</programlisting>
<acronym>OVS</acronym>. Edit the
<filename>/etc/neutron/neutron.conf</filename>
file:</para>
- <programlisting language="ini" os="ubuntu;opensuse;sles">core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2</programlisting>
- <programlisting language="ini" os="rhel;centos;fedora">core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2</programlisting>
+ <programlisting language="ini" os="ubuntu;opensuse;sles">core_plugin = openvswitch</programlisting>
+ <programlisting language="ini" os="rhel;centos;fedora">core_plugin = openvswitch</programlisting>
</step>
<step>
<para>You must configure a firewall as well. You should
diff --git a/doc/install-guide/section_neutron-ovs-controller-node.xml b/doc/install-guide/section_neutron-ovs-controller-node.xml
index 21d631e024..20c5ab6830 100644
--- a/doc/install-guide/section_neutron-ovs-controller-node.xml
+++ b/doc/install-guide/section_neutron-ovs-controller-node.xml
@@ -185,7 +185,7 @@ rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
use <acronym>OVS</acronym>. Edit the
<filename>/etc/neutron/neutron.conf</filename>
file:</para>
- <programlisting language="ini">core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2</programlisting>
+ <programlisting language="ini">core_plugin = openvswitch</programlisting>
<note>
<para>The dedicated controller node does not need to run
Open vSwitch or the Open vSwitch agent.</para>
diff --git a/doc/install-guide/section_neutron-ovs-network-node.xml b/doc/install-guide/section_neutron-ovs-network-node.xml
index 3add70b46a..0b1b89e847 100644
--- a/doc/install-guide/section_neutron-ovs-network-node.xml
+++ b/doc/install-guide/section_neutron-ovs-network-node.xml
@@ -279,7 +279,7 @@ use_namespaces = True</programlisting>
<acronym>OVS</acronym>. Edit the
<filename>/etc/neutron/neutron.conf</filename>
file:</para>
- <programlisting language="ini">core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2</programlisting>
+ <programlisting language="ini">core_plugin = openvswitch</programlisting>
</step>
<step>
<para>Configure a firewall plug-in. If you do not wish to