openstack
/
neutron
Code Issues Proposed changes

Merge "fix missing l2pop config option docs"

This commit is contained in:
Jenkins 2017-09-15 02:04:31 +00:00 committed by Gerrit Code Review
parent 81dd9b5317 1b4559a5e4
commit 4a27f4e526
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/admin/config-ml2.rst
View File

@ -243,7 +243,7 @@ For more details, see the
The administrator can configure some optional configuration options. For more The administrator can configure some optional configuration options. For more
details, see the related section in the details, see the related section in the
`Configuration Reference <https://docs.openstack.org/ocata/config-reference/networking/networking_options_reference.html#modular-layer-2-ml2-l2-population-mechanism-configuration-options>`__. `Configuration Reference <../configuration/ml2-conf.html#l2pop>`__.
* Specialized * Specialized

5
neutron/opts.py
View File

@ -36,6 +36,7 @@ import neutron.conf.extensions.allowedaddresspairs
import neutron.conf.plugins.ml2.config import neutron.conf.plugins.ml2.config
import neutron.conf.plugins.ml2.drivers.agent import neutron.conf.plugins.ml2.drivers.agent
import neutron.conf.plugins.ml2.drivers.driver_type import neutron.conf.plugins.ml2.drivers.driver_type
import neutron.conf.plugins.ml2.drivers.l2pop
import neutron.conf.plugins.ml2.drivers.linuxbridge import neutron.conf.plugins.ml2.drivers.linuxbridge
import neutron.conf.plugins.ml2.drivers.macvtap import neutron.conf.plugins.ml2.drivers.macvtap
import neutron.conf.plugins.ml2.drivers.mech_sriov.agent_common import neutron.conf.plugins.ml2.drivers.mech_sriov.agent_common
@ -247,7 +248,9 @@ def list_ml2_conf_opts():
('ml2_type_geneve', ('ml2_type_geneve',
neutron.conf.plugins.ml2.drivers.driver_type.geneve_opts), neutron.conf.plugins.ml2.drivers.driver_type.geneve_opts),
('securitygroup', ('securitygroup',
neutron.conf.agent.securitygroups_rpc.security_group_opts) neutron.conf.agent.securitygroups_rpc.security_group_opts),
('l2pop',
neutron.conf.plugins.ml2.drivers.l2pop.l2_population_options)
] ]