openstack
/
openstack-manuals
Code Issues Proposed changes

Merge "Remove references to deprecated use_namespaces option"

This commit is contained in:
Jenkins 2016-01-14 01:12:52 +00:00 committed by Gerrit Code Review
parent d97bfbc4e9 adb59aed5c
commit 865f65b1ea
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/admin-guide-cloud/source/networking_multi-dhcp-agents.rst
View File

@ -24,7 +24,7 @@ scalability and HA.
| agent | agent | | agent | agent |
| provider | Provider Network | | provider | Provider Network |
| router | Neutron L3 Router | | router | Neutron L3 Router |
| lbaas | Load Balancing service | | lbaas | Load Balancing service |
| extraroute | Neutron Extra Route | | extraroute | Neutron Extra Route |
+-----------------+--------------------------+ +-----------------+--------------------------+
@ -250,7 +250,6 @@ neutron server when it starts up.
| binary | neutron-dhcp-agent | | binary | neutron-dhcp-agent |
| configurations |{ | | configurations |{ |
| | "subnets": 1, | | | "subnets": 1, |
| | "use_namespaces": true, |
| | "dhcp_driver": "neutron.agent.linux.dhcp.Dnsmasq",| | | "dhcp_driver": "neutron.agent.linux.dhcp.Dnsmasq",|
| | "networks": 1, | | | "networks": 1, |
| | "dhcp_lease_time": 120, | | | "dhcp_lease_time": 120, |
@ -486,4 +485,3 @@ To run the following commands, you must stop the DHCP agent on HostA.
After deletion, if you restart the DHCP agent, it appears on the agent After deletion, if you restart the DHCP agent, it appears on the agent
list again. list again.

3
doc/networking-guide/source/scenario_dvr_ovs.rst
View File

@ -606,7 +606,6 @@ Network node
[DEFAULT] [DEFAULT]
verbose = True verbose = True
interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
use_namespaces = True
external_network_bridge = external_network_bridge =
router_delete_namespaces = True router_delete_namespaces = True
agent_mode = dvr_snat agent_mode = dvr_snat
@ -625,7 +624,6 @@ Network node
verbose = True verbose = True
interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
use_namespaces = True
dhcp_delete_namespaces = True dhcp_delete_namespaces = True
#. (Optional) Reduce MTU for GRE/VXLAN project networks. #. (Optional) Reduce MTU for GRE/VXLAN project networks.
@ -721,7 +719,6 @@ Compute nodes
[DEFAULT] [DEFAULT]
verbose = True verbose = True
interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
use_namespaces = True
external_network_bridge = external_network_bridge =
router_delete_namespaces = True router_delete_namespaces = True
agent_mode = dvr agent_mode = dvr