diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/profile/base/loadbalancer.pp | 44 | ||||
| -rw-r--r-- | manifests/profile/base/neutron.pp | 9 | ||||
| -rw-r--r-- | manifests/profile/base/swift/proxy.pp | 1 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/haproxy.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/loadbalancer.pp | 102 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/neutron.pp | 5 |
6 files changed, 13 insertions, 150 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 } diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp index 58e2b6f..40e61ae 100644 --- a/manifests/profile/base/swift/proxy.pp +++ b/manifests/profile/base/swift/proxy.pp @@ -40,5 +40,6 @@ class tripleo::profile::base::swift::proxy ( include ::swift::proxy::catch_errors include ::swift::proxy::tempurl include ::swift::proxy::formpost + include ::swift::proxy::bulk } } diff --git a/manifests/profile/pacemaker/haproxy.pp b/manifests/profile/pacemaker/haproxy.pp index 58bb174..a7aca58 100644 --- a/manifests/profile/pacemaker/haproxy.pp +++ b/manifests/profile/pacemaker/haproxy.pp @@ -37,7 +37,7 @@ class tripleo::profile::pacemaker::haproxy ( $enable_load_balancer = hiera('enable_load_balancer', true) ) { - include ::tripleo::profile::base::loadbalancer + include ::tripleo::profile::base::haproxy if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true diff --git a/manifests/profile/pacemaker/loadbalancer.pp b/manifests/profile/pacemaker/loadbalancer.pp deleted file mode 100644 index 608d0e4..0000000 --- a/manifests/profile/pacemaker/loadbalancer.pp +++ /dev/null @@ -1,102 +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::loadbalancer -# -# Loadbalancer Pacemaker HA 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') -# -# [*enable_load_balancer*] -# (Optional) Whether load balancing is enabled for this cluster -# Defaults to hiera('enable_load_balancer', true) -# -class tripleo::profile::pacemaker::loadbalancer ( - $bootstrap_node = hiera('bootstrap_nodeid'), - $step = hiera('step'), - $enable_load_balancer = hiera('enable_load_balancer', true) -) { - - # TODO(emilien): remove this class once THT does not use it anymore - warning('tripleo::profile::pacemaker::loadbalancer is deprecated and will be removed very soon.') - - include ::tripleo::profile::base::loadbalancer - - if $::hostname == downcase($bootstrap_node) { - $pacemaker_master = true - } else { - $pacemaker_master = false - } - - if $step >= 2 and $pacemaker_master and $enable_load_balancer { - # FIXME: we should not have to access tripleo::haproxy class - # parameters here to configure pacemaker VIPs. The configuration - # of pacemaker VIPs could move into puppet-tripleo or we should - # make use of less specific hiera parameters here for the settings. - pacemaker::resource::service { 'haproxy': - clone_params => true, - } - - $control_vip = hiera('controller_virtual_ip') - tripleo::pacemaker::haproxy_with_vip { 'haproxy_and_control_vip': - vip_name => 'control', - ip_address => $control_vip, - } - - $public_vip = hiera('public_virtual_ip') - tripleo::pacemaker::haproxy_with_vip { 'haproxy_and_public_vip': - ensure => $public_vip and $public_vip != $control_vip, - vip_name => 'public', - ip_address => $public_vip, - } - - $redis_vip = hiera('redis_vip') - tripleo::pacemaker::haproxy_with_vip { 'haproxy_and_redis_vip': - ensure => $redis_vip and $redis_vip != $control_vip, - vip_name => 'redis', - ip_address => $redis_vip, - } - - $internal_api_vip = hiera('internal_api_virtual_ip') - tripleo::pacemaker::haproxy_with_vip { 'haproxy_and_internal_api_vip': - ensure => $internal_api_vip and $internal_api_vip != $control_vip, - vip_name => 'internal_api', - ip_address => $internal_api_vip, - } - - $storage_vip = hiera('storage_virtual_ip') - tripleo::pacemaker::haproxy_with_vip { 'haproxy_and_storage_vip': - ensure => $storage_vip and $storage_vip != $control_vip, - vip_name => 'storage', - ip_address => $storage_vip, - } - - $storage_mgmt_vip = hiera('storage_mgmt_virtual_ip') - tripleo::pacemaker::haproxy_with_vip { 'haproxy_and_storage_mgmt_vip': - ensure => $storage_mgmt_vip and $storage_mgmt_vip != $control_vip, - vip_name => 'storage_mgmt', - ip_address => $storage_mgmt_vip, - } - } - -} diff --git a/manifests/profile/pacemaker/neutron.pp b/manifests/profile/pacemaker/neutron.pp index 03ccbc3..2af53dc 100644 --- a/manifests/profile/pacemaker/neutron.pp +++ b/manifests/profile/pacemaker/neutron.pp @@ -61,9 +61,12 @@ class tripleo::profile::pacemaker::neutron ( stop => '/bin/true', } + class { '::tripleo::profile::base::neutron': + sync_db => ($::hostname == downcase($pacemaker_master)), + } + if $step >= 4 { include ::neutron::params - include ::tripleo::profile::base::neutron # To be removed when puppet-oslo comes into service neutron_config { |