From: Louis Taylor Date: Mon, 20 Jul 2015 17:20:29 +0000 (+0000) Subject: Port help text for dvr_base_mac from neutron.conf X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a45e04e1e1e965e3d5729212980d3c609d62a31a;p=openstack-build%2Fneutron-build.git Port help text for dvr_base_mac from neutron.conf The help text for the option in the current static configuration file contained additional information which would be lost when we switch to generating the file. This patch copies it over to the oslo.config help parameter. Related-blueprint: autogen-neutron-conf-file Change-Id: Id03925b4bbbee697bf5372392c2345802a1863f8 --- diff --git a/neutron/db/dvr_mac_db.py b/neutron/db/dvr_mac_db.py index c0f0d656a..0502aa002 100644 --- a/neutron/db/dvr_mac_db.py +++ b/neutron/db/dvr_mac_db.py @@ -35,8 +35,15 @@ LOG = logging.getLogger(__name__) dvr_mac_address_opts = [ cfg.StrOpt('dvr_base_mac', default="fa:16:3f:00:00:00", - help=_('The base mac address used for unique ' - 'DVR instances by Neutron')), + help=_("The base mac address used for unique " + "DVR instances by Neutron. The first 3 octets will " + "remain unchanged. If the 4th octet is not 00, it will " + "also be used. The others will be randomly generated. " + "The 'dvr_base_mac' *must* be different from " + "'base_mac' to avoid mixing them up with MAC's " + "allocated for tenant ports. A 4 octet example would be " + "dvr_base_mac = fa:16:3f:4f:00:00. The default is 3 " + "octet")), ] cfg.CONF.register_opts(dvr_mac_address_opts)