aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-09-06 22:42:07 +0000
committerGerrit Code Review <review@openstack.org>2017-09-06 22:42:07 +0000
commitb549c9837bbf3751f3c688ea34cbb52eb59fa443 (patch)
treed0b4125ac9270a0bd2d221f488c05ee00e6f8ca6 /manifests/profile/base
parent08677754f9622bc9264fda00251cf6bb3f00cc24 (diff)
parent6c9e3f3c29b4ec1b72c6a3c7314d727495d2ddae (diff)
Merge "Change references from nsx_v3 to nsx" into stable/pike
Diffstat (limited to 'manifests/profile/base')
-rw-r--r--manifests/profile/base/neutron/plugins/nsx.pp (renamed from manifests/profile/base/neutron/plugins/nsx_v3.pp)6
1 files changed, 3 insertions, 3 deletions
diff --git a/manifests/profile/base/neutron/plugins/nsx_v3.pp b/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
}
}