Merge "Remove deprecated use_namespaces option"

This commit is contained in:
Jenkins 2016-01-22 14:22:20 +00:00 committed by Gerrit Code Review
commit f51160f172
6 changed files with 0 additions and 27 deletions

View File

@ -38,23 +38,6 @@ service. The driver adds metering to the routing interface.
| | BridgeInterfaceDriver |
+------------------------------------------+---------------------------------+
Namespace
---------
The metering agent and the L3 agent must have the same network
namespaces configuration.
.. note::
If the Linux installation does not support network namespaces, you
must disable network namespaces in the L3 metering configuration
file. The default value of the ``use_namespaces`` option is
``True``.
.. code-block:: ini
use_namespaces = False
L3 metering driver
------------------

View File

@ -136,7 +136,6 @@ These DHCP agent options are required in the
[DEFAULT]
enable_isolated_metadata = True
use_namespaces = True
interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
DHCP agent setup: NSX plug-in
@ -150,7 +149,6 @@ These DHCP agent options are required in the
[DEFAULT]
enable_metadata_network = True
enable_isolated_metadata = True
use_namespaces = True
interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
Configure L3 agent

View File

@ -646,7 +646,6 @@ Network node
[DEFAULT]
verbose = True
interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
use_namespaces = True
external_network_bridge =
router_delete_namespaces = True
@ -659,7 +658,6 @@ Network node
verbose = True
interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
use_namespaces = True
dhcp_delete_namespaces = True
#. (Optional) Reduce MTU for VXLAN project networks.

View File

@ -749,7 +749,6 @@ Network node
[DEFAULT]
verbose = True
interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
use_namespaces = True
external_network_bridge =
router_delete_namespaces = True
@ -767,7 +766,6 @@ Network node
verbose = True
interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
use_namespaces = True
dhcp_delete_namespaces = True
#. (Optional) Reduce MTU for VXLAN/GRE project networks.

View File

@ -318,7 +318,6 @@ Network nodes
[DEFAULT]
verbose = True
interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
use_namespaces = True
external_network_bridge =
router_delete_namespaces = True
agent_mode = legacy
@ -337,7 +336,6 @@ Network nodes
verbose = True
interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
use_namespaces = True
dhcp_delete_namespaces = True
#. (Optional) Reduce MTU for VXLAN project networks.

View File

@ -336,7 +336,6 @@ Network nodes
[DEFAULT]
verbose = True
interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
use_namespaces = True
external_network_bridge =
router_delete_namespaces = True
agent_mode = legacy
@ -355,7 +354,6 @@ Network nodes
verbose = True
interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
use_namespaces = True
dhcp_delete_namespaces = True
#. (Optional) Reduce MTU for VXLAN/GRE project networks.