Merge "NSXv3: Default native_dhcp_metadata to True"

This commit is contained in:
Jenkins 2017-05-03 17:29:01 +00:00 committed by Gerrit Code Review
commit 586f8afb53
3 changed files with 11 additions and 2 deletions

View File

@ -32,7 +32,7 @@ NSX_GATEWAY_NETWORK_INTERFACE=${NSX_GATEWAY_NETWORK_INTERFACE:-}
Q_USE_PROVIDERNET_FOR_PUBLIC=False
# Native support from platform
NATIVE_DHCP_METADATA=${NATIVE_DHCP_METADATA:-False}
NATIVE_DHCP_METADATA=${NATIVE_DHCP_METADATA:-True}
NATIVE_METADATA_ROUTE=${NATIVE_METADATA_ROUTE:-169.254.169.254/31}
METADATA_PROXY_SHARED_SECRET=${METADATA_PROXY_SHARED_SECRET:-}

View File

@ -0,0 +1,9 @@
---
prelude: >
Starting Newton release we added support for native DHCP and metadata
provided by NSXv3 backend.
features:
- Since now most of the NSXv3 deployment are using native DHCP/Metadata,
default this option native_dhcp_metadata to True. By default, it will
use NSXv3 native DHCP and Metadata unless this has been explicitly
set to False.

View File

@ -379,7 +379,7 @@ nsx_v3_opts = [
"for a router only when the router is attached to a "
"DHCP-disabled subnet.")),
cfg.BoolOpt('native_dhcp_metadata',
default=False,
default=True,
help=_("If true, DHCP and metadata proxy services will be "
"provided by NSX backend.")),
cfg.StrOpt('native_metadata_route',