diff options
Diffstat (limited to 'manifests/profile/base')
| -rw-r--r-- | manifests/profile/base/loadbalancer.pp | 44 | ||||
| -rw-r--r-- | manifests/profile/base/neutron.pp | 9 |
2 files changed, 7 insertions, 46 deletions
diff --git a/manifests/profile/base/loadbalancer.pp b/manifests/profile/base/loadbalancer.pp deleted file mode 100644 index 2f298f0..0000000 --- a/manifests/profile/base/loadbalancer.pp +++ /dev/null @@ -1,44 +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::loadbalancer -# -# Loadbalancer profile for tripleo -# -# === Parameters -# -# [*step*] -# (Optional) The current step in deployment. See tripleo-heat-templates -# for more details. -# Defaults to hiera('step') -# -# [*enable_load_balancer*] -# (Optional) Whether or not loadbalancer is enabled. -# Defaults to hiera('enable_load_balancer', true). -# -class tripleo::profile::base::loadbalancer ( - $enable_load_balancer = hiera('enable_load_balancer', true), - $step = hiera('step'), -) { - - # TODO(emilien): remove this class once THT does not use it anymore - warning('tripleo::profile::base::loadbalancer is deprecated and will be removed very soon.') - if $step >= 1 { - if $enable_load_balancer { - include ::tripleo::haproxy - } - } - -} - diff --git a/manifests/profile/base/neutron.pp b/manifests/profile/base/neutron.pp index 2958170..d5efa81 100644 --- a/manifests/profile/base/neutron.pp +++ b/manifests/profile/base/neutron.pp @@ -18,14 +18,19 @@ # # === Parameters # +# [*sync_db*] +# (Optional) Whether to run db sync +# Defaults to true +# # [*step*] # (Optional) The current step of the deployment # Defaults to hiera('step') # class tripleo::profile::base::neutron ( - $step = hiera('step'), + $sync_db = true, + $step = hiera('step'), ) { - if $step >= 4 { + if hiera('step') >= 4 or ( hiera('step') >= 3 and $sync_db ) { include ::neutron include ::neutron::config } |