openstack
/
neutron
Code Issues Proposed changes

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
This commit is contained in:
Louis Taylor 2015-07-20 17:20:29 +00:00
parent c7bcf6d4d6
commit a45e04e1e1
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
neutron/db/dvr_mac_db.py
View File

@ -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)