From: Jay Jahns <jjahns@vmware.com>
Date: Sat, 26 Aug 2017 03:24:43 +0000 (-0700)
Subject: Change references from nsx_v3 to nsx
X-Git-Tag: opnfv-6.0.0~34^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=6c9e3f3c29b4ec1b72c6a3c7314d727495d2ddae;p=apex-puppet-tripleo.git

Change references from nsx_v3 to nsx

This patch changes references from nsx_v3 to nsx since the nsx_v3 functionality
is the only one supported at this time.

Change-Id: Id73f675844b0df2eafa45507d1c28f16cd0b15b2
Closes-Bug: #1713191
(cherry picked from commit f27c45a0925546f3b9627fce7d223a1bba140ce0)
---

diff --git a/manifests/profile/base/neutron/plugins/nsx_v3.pp b/manifests/profile/base/neutron/plugins/nsx.pp
similarity index 88%
rename from manifests/profile/base/neutron/plugins/nsx_v3.pp
rename to manifests/profile/base/neutron/plugins/nsx.pp
index b534a2f..d8a6189 100644
--- a/manifests/profile/base/neutron/plugins/nsx_v3.pp
+++ b/manifests/profile/base/neutron/plugins/nsx.pp
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-# == Class: tripleo::profile::base::neutron::plugins::nsx_v3
+# == Class: tripleo::profile::base::neutron::plugins::nsx
 #
 # VMware NSXv3 Neutron profile for tripleo
 #
@@ -27,7 +27,7 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-class tripleo::profile::base::neutron::plugins::nsx_v3 (
+class tripleo::profile::base::neutron::plugins::nsx (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
   $step           = Integer(hiera('step')),
 ) {
@@ -40,6 +40,6 @@ class tripleo::profile::base::neutron::plugins::nsx_v3 (
   include ::tripleo::profile::base::neutron
 
   if $step >= 4 or ( $step >= 3 and $sync_db ) {
-    include ::neutron::plugins::nsx_v3
+    include ::neutron::plugins::nsx
   }
 }