openstack
/
neutron
Code Issues Proposed changes

fix missing l2pop config option docs 

The l2pop ML2 mechanism driver's configuration options are no longer
being generated during the docs build. This patch adds the l2pop
config options back into the ml2 sample config generation and also
fixes a link to them in the admin docs.

This fix is a candidate for backport to pike.

Change-Id: Ia26b4d1995690e7291b6476dc683271e12de09ab
Closes-Bug: #1714528
(cherry picked from commit 1b4559a5e4)
This commit is contained in:
Boden R 2017-09-11 13:32:33 -06:00 committed by Bernard Cafarelli
parent dde92f0472
commit 7c07dc1276
No known key found for this signature in database
GPG Key ID: D148244A3C2462BD
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

@ -245,7 +245,7 @@ For more details, see the
The administrator can configure some optional configuration options. For more
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

5
neutron/opts.py
View File

@ -37,6 +37,7 @@ import neutron.conf.common
import neutron.conf.extensions.allowedaddresspairs
import neutron.conf.plugins.ml2.drivers.agent
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.macvtap
import neutron.conf.plugins.ml2.drivers.mech_sriov.agent_common
@ -249,7 +250,9 @@ def list_ml2_conf_opts():
('ml2_type_geneve',
neutron.conf.plugins.ml2.drivers.driver_type.geneve_opts),
('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)
]