From e49d016c158bcccc24b90bba171fd654a151ea58 Mon Sep 17 00:00:00 2001 From: Shih-Hao Li Date: Wed, 23 Nov 2016 10:36:48 -0800 Subject: [PATCH] NSXv3: Change default metadata route to 169.254.169.254/31 This change allows metadata route passed in DHCP option 121 also working on older cirros images. Change-Id: Iaad3406de28309ea5b06aad541e675b9a5c4eaec --- devstack/lib/vmware_nsx_v3 | 2 +- vmware_nsx/common/config.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devstack/lib/vmware_nsx_v3 b/devstack/lib/vmware_nsx_v3 index 24a7dfa5e3..3abb13911d 100644 --- a/devstack/lib/vmware_nsx_v3 +++ b/devstack/lib/vmware_nsx_v3 @@ -33,7 +33,7 @@ Q_USE_PROVIDERNET_FOR_PUBLIC=False # Native support from platform NATIVE_DHCP_METADATA=${NATIVE_DHCP_METADATA:-False} -NATIVE_METADATA_ROUTE=${NATIVE_METADATA_ROUTE:-169.254.169.254/32} +NATIVE_METADATA_ROUTE=${NATIVE_METADATA_ROUTE:-169.254.169.254/31} METADATA_PROXY_SHARED_SECRET=${METADATA_PROXY_SHARED_SECRET:-} # Save trace setting diff --git a/vmware_nsx/common/config.py b/vmware_nsx/common/config.py index 1c75194a62..db2ba93436 100644 --- a/vmware_nsx/common/config.py +++ b/vmware_nsx/common/config.py @@ -361,7 +361,7 @@ nsx_v3_opts = [ help=_("If true, DHCP and metadata proxy services will be " "provided by NSX backend.")), cfg.StrOpt('native_metadata_route', - default="169.254.169.254/32", + default="169.254.169.254/31", help=_("The metadata route used for native metadata proxy " "service.")), cfg.StrOpt('dhcp_profile',