Change flat network name for nosdn fdio scenario

[apex-tripleo-heat-templates.git] / puppet / services / neutron-plugin-nsx.yaml

diff --git a/puppet/services/neutron-plugin-nsx.yaml b/puppet/services/neutron-plugin-nsx.yaml
index c0b94ce..ad0fc7f 100644 (file)
--- a/puppet/services/neutron-plugin-nsx.yaml
+++ b/puppet/services/neutron-plugin-nsx.yaml
@@ -1,9 +1,13 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack Neutron NSX
 
 parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -45,7 +49,7 @@ parameters:
   NativeDhcpMetadata:
     default: True
     description: This is the flag to indicate if using native DHCP/Metadata or not.
-    type: string
+    type: boolean
   DhcpProfileUuid:
     description: This is the UUID of the NSX DHCP Profile that will be used to enable
                  native DHCP service.
@@ -61,14 +65,14 @@ outputs:
     value:
       service_name: neutron_plugin_nsx
       config_settings:
-        neutron::plugins::nsx_v3::default_overlay_tz: {get_param: DefaultOverlayTz}
-        neutron::plugins::nsx_v3::default_tier0_router: {get_param: DefaultTier0Router}
-        neutron::plugins::nsx_v3::nsx_api_managers: {get_param: NsxApiManagers}
-        neutron::plugins::nsx_v3::nsx_api_user: {get_param: NsxApiUser}
-        neutron::plugins::nsx_v3::nsx_api_password: {get_param: NsxApiPassword}
-        neutron::plugins::nsx_v3::native_dhcp_metadata: {get_param: NativeDhcpMetadata}
-        neutron::plugins::nsx_v3::dhcp_profile_uuid: {get_param: DhcpProfileUuid}
-        neutron::plugins::nsx_v3::metadata_proxy_uuid: {get_param: MetadataProxyUuid}
+        neutron::plugins::nsx::default_overlay_tz: {get_param: DefaultOverlayTz}
+        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}
 
       step_config: |
-        include tripleo::profile::base::neutron::plugins::nsx_v3
+        include tripleo::profile::base::neutron::plugins::nsx