From: Jay Jahns <jjahns@vmware.com>
Date: Sat, 26 Aug 2017 03:36:36 +0000 (-0700)
Subject: Change all references of nsx_v3 to nsx.
X-Git-Tag: opnfv-6.0.0~136^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=72be2aed8e3a5230ce2575a2ee29c269873203b3;p=apex-tripleo-heat-templates.git

Change all references of nsx_v3 to nsx.

Change-Id: I31c49926b0ba93f79db3d778c574bd9a480e70cd
Closes-Bug: #1713193
Depends-On: Id73f675844b0df2eafa45507d1c28f16cd0b15b2
---

diff --git a/puppet/services/neutron-plugin-nsx.yaml b/puppet/services/neutron-plugin-nsx.yaml
index 2774b03e..26380649 100644
--- a/puppet/services/neutron-plugin-nsx.yaml
+++ b/puppet/services/neutron-plugin-nsx.yaml
@@ -65,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