From 6c9e3f3c29b4ec1b72c6a3c7314d727495d2ddae Mon Sep 17 00:00:00 2001 From: Jay Jahns Date: Fri, 25 Aug 2017 20:24:43 -0700 Subject: 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) --- manifests/profile/base/neutron/plugins/nsx.pp | 45 ++++++++++++++++++++++++ manifests/profile/base/neutron/plugins/nsx_v3.pp | 45 ------------------------ 2 files changed, 45 insertions(+), 45 deletions(-) create mode 100644 manifests/profile/base/neutron/plugins/nsx.pp delete mode 100644 manifests/profile/base/neutron/plugins/nsx_v3.pp (limited to 'manifests/profile/base/neutron') diff --git a/manifests/profile/base/neutron/plugins/nsx.pp b/manifests/profile/base/neutron/plugins/nsx.pp new file mode 100644 index 0000000..d8a6189 --- /dev/null +++ b/manifests/profile/base/neutron/plugins/nsx.pp @@ -0,0 +1,45 @@ +# Copyright 2017 VMware, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# == Class: tripleo::profile::base::neutron::plugins::nsx +# +# VMware NSXv3 Neutron profile for tripleo +# +# === Parameters +# +# [*bootstrap_node*] +# (Optional) The hostname of the node responsible for bootstrapping tasks +# Defaults to hiera('bootstrap_nodeid') +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +class tripleo::profile::base::neutron::plugins::nsx ( + $bootstrap_node = hiera('bootstrap_nodeid', undef), + $step = Integer(hiera('step')), +) { + if $::hostname == downcase($bootstrap_node) { + $sync_db = true + } else { + $sync_db = false + } + + include ::tripleo::profile::base::neutron + + if $step >= 4 or ( $step >= 3 and $sync_db ) { + include ::neutron::plugins::nsx + } +} diff --git a/manifests/profile/base/neutron/plugins/nsx_v3.pp b/manifests/profile/base/neutron/plugins/nsx_v3.pp deleted file mode 100644 index b534a2f..0000000 --- a/manifests/profile/base/neutron/plugins/nsx_v3.pp +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 2017 VMware, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# == Class: tripleo::profile::base::neutron::plugins::nsx_v3 -# -# VMware NSXv3 Neutron profile for tripleo -# -# === Parameters -# -# [*bootstrap_node*] -# (Optional) The hostname of the node responsible for bootstrapping tasks -# Defaults to hiera('bootstrap_nodeid') -# -# [*step*] -# (Optional) The current step in deployment. See tripleo-heat-templates -# for more details. -# Defaults to hiera('step') -# -class tripleo::profile::base::neutron::plugins::nsx_v3 ( - $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = Integer(hiera('step')), -) { - if $::hostname == downcase($bootstrap_node) { - $sync_db = true - } else { - $sync_db = false - } - - include ::tripleo::profile::base::neutron - - if $step >= 4 or ( $step >= 3 and $sync_db ) { - include ::neutron::plugins::nsx_v3 - } -} -- cgit 1.2.3-korg