From f1da0a27ee954b34013df3fd647c9e663a28d6fd Mon Sep 17 00:00:00 2001
From: Tong Liu <tongl@vmware.com>
Date: Mon, 24 Sep 2018 17:37:27 +0000
Subject: [PATCH] Add more NSX config parameters

Update dhcp_profile_uuid and metadata_proxy_uuid config params
based on NSX plugin side changes, and also expose more config
parameters that can be used in depoying tripleo with nsx plugin.

Change-Id: I787606f39f1b707211f19415aceb81cda8260d91
(cherry picked from commit 11b0b86afb28c8731074a865905a1f1f15656218)
---
 puppet/services/neutron-plugin-nsx.yaml | 36 ++++++++++++++++++-------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/puppet/services/neutron-plugin-nsx.yaml b/puppet/services/neutron-plugin-nsx.yaml
index b96879c943..20a68269ee 100644
--- a/puppet/services/neutron-plugin-nsx.yaml
+++ b/puppet/services/neutron-plugin-nsx.yaml
@@ -31,7 +31,17 @@ parameters:
                  via parameter_defaults in the resource registry.
     type: json
   DefaultOverlayTz:
-    description: UUID of the default NSX overlay transport zone.
+    description: Name or UUID of the default NSX overlay transport zone.
+    type: string
+  DefaultVlanTz:
+    default: ''
+    description: Name or UUID of the default NSX VLAN transport zone.
+    type: string
+  DefaultBridgeCluster:
+    default: ''
+    description: Name or UUID of the default NSX bridge cluster that will be
+                 used to perform L2 gateway bridging between VXLAN and VLAN
+                 networks.
     type: string
   DefaultTier0Router:
     description: UUID of the default tier0 router that will be used for connecting to
@@ -50,13 +60,18 @@ parameters:
     default: True
     description: This is the flag to indicate if using native DHCP/Metadata or not.
     type: boolean
-  DhcpProfileUuid:
-    description: This is the UUID of the NSX DHCP Profile that will be used to enable
-                 native DHCP service.
+  DhcpProfile:
+    description: This is the name or UUID of the NSX DHCP Profile that will be
+                 used to enable native DHCP service.
     type: string
-  MetadataProxyUuid:
-    description: This is the UUID of the NSX Metadata Proxy that will be used to enable
-                 native metadata service.
+  MetadataProxy:
+    description: This is the name or UUID of the NSX Metadata Proxy that will
+                 be used to enable native metadata service.
+    type: string
+  DhcpRelayService:
+    default: ''
+    description: This is the name or UUID of the NSX relay service that will
+                 be used to enable DHCP relay on router ports.
     type: string
 
 outputs:
@@ -66,13 +81,16 @@ outputs:
       service_name: neutron_plugin_nsx
       config_settings:
         neutron::plugins::nsx::default_overlay_tz: {get_param: DefaultOverlayTz}
+        neutron::plugins::nsx::default_vlan_tz: {get_param: DefaultVlanTz}
+        neutron::plugins::nsx::default_bridge_cluster: {get_param: DefaultBridgeCluster}
         neutron::plugins::nsx::default_tier0_router: {get_param: DefaultTier0Router}
         neutron::plugins::nsx::nsx_api_managers: {get_param: NsxApiManagers}
         neutron::plugins::nsx::nsx_api_user: {get_param: NsxApiUser}
         neutron::plugins::nsx::nsx_api_password: {get_param: NsxApiPassword}
         neutron::plugins::nsx::native_dhcp_metadata: {get_param: NativeDhcpMetadata}
-        neutron::plugins::nsx::dhcp_profile_uuid: {get_param: DhcpProfileUuid}
-        neutron::plugins::nsx::metadata_proxy_uuid: {get_param: MetadataProxyUuid}
+        neutron::plugins::nsx::dhcp_profile: {get_param: DhcpProfile}
+        neutron::plugins::nsx::dhcp_relay_service: {get_param: DhcpRelayService}
+        neutron::plugins::nsx::metadata_proxy: {get_param: MetadataProxy}
 
       step_config: |
         include tripleo::profile::base::neutron::plugins::nsx