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 c0f0d656aa748e17ca3471c9196cb40972b50dd9..0502aa0029f17a65b9c0ea356b9b1bbe204ad5e2 100644 (file)
--- 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)