diff options
author | 2016-06-30 12:43:47 +0000 | |
---|---|---|
committer | 2016-06-30 12:43:47 +0000 | |
commit | c6dafdec4ed04c7af6d85d750119251bbae3b951 (patch) | |
tree | b1bd26222c1f2cc7c7903accd86243d2f354e7d0 /manifests/profile | |
parent | 4a7a0d8879d94bacd985b7295210ac0480ea9a71 (diff) | |
parent | 6cb9f63e6208e992fa8d2ac84706c81138df81fc (diff) |
Merge "Remove base/neutron/ml2.pp"
Diffstat (limited to 'manifests/profile')
-rw-r--r-- | manifests/profile/base/neutron/ml2.pp | 64 | ||||
-rw-r--r-- | manifests/profile/pacemaker/neutron/ml2.pp | 38 |
2 files changed, 0 insertions, 102 deletions
diff --git a/manifests/profile/base/neutron/ml2.pp b/manifests/profile/base/neutron/ml2.pp deleted file mode 100644 index 59c74c8..0000000 --- a/manifests/profile/base/neutron/ml2.pp +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 2016 Red Hat, 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::ml2 -# -# Neutron ML2 driver profile for tripleo -# -# === Parameters -# -# [*mechanism_drivers*] -# (Optional) The mechanism drivers to use with the Ml2 plugin -# Defaults to hiera('neutron::plugins::ml2::mechanism_drivers') -# -# [*sync_db*] -# (Optional) Whether to run Neutron DB sync operations -# Defaults to undef -# -# [*step*] -# (Optional) The current step in deployment. See tripleo-heat-templates -# for more details. -# Defaults to hiera('step') -# -class tripleo::profile::base::neutron::ml2 ( - $mechanism_drivers = hiera('neutron::plugins::ml2::mechanism_drivers'), - $sync_db = true, - $step = hiera('step'), -) { - - warning('This class is going is deprecated and will be removed very soon, replaced by tripleo::profile::base::neutron::plugins::ml2.') - - if $step >= 4 or ( $step >= 3 and $sync_db ) { - include ::neutron::plugins::ml2 - include ::tripleo::profile::base::neutron - - if 'cisco_n1kv' in $mechanism_drivers { - include ::tripleo::profile::base::neutron::n1k - } - - if 'cisco_ucsm' in $mechanism_drivers { - include ::neutron::plugins::ml2::cisco::ucsm - } - - if 'cisco_nexus' in $mechanism_drivers { - include ::neutron::plugins::ml2::cisco::nexus - include ::neutron::plugins::ml2::cisco::type_nexus_vxlan - } - - if 'bsn_ml2' in $mechanism_drivers { - include ::neutron::plugins::ml2::bigswitch::restproxy - include ::neutron::agents::bigswitch - } - } -} diff --git a/manifests/profile/pacemaker/neutron/ml2.pp b/manifests/profile/pacemaker/neutron/ml2.pp deleted file mode 100644 index ab5a219..0000000 --- a/manifests/profile/pacemaker/neutron/ml2.pp +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2016 Red Hat, 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::pacemaker::neutron::ml2 -# -# Neutron ML2 driver Pacemaker HA profile for tripleo -# -# === Parameters -# -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master -# Defaults to hiera('bootstrap_nodeid') -# -class tripleo::profile::pacemaker::neutron::ml2 ( - $pacemaker_master = hiera('bootstrap_nodeid'), -) { - - warning('This class is going is deprecated and will be removed very soon, replaced by tripleo::profile::pacemaker::neutron::plugins::ml2.') - - include ::neutron::params - include ::tripleo::profile::pacemaker::neutron - - class { '::tripleo::profile::base::neutron::plugins::ml2': - sync_db => ($::hostname == downcase($pacemaker_master)) - } - -} |