Remove loadbalancer profile

We don't need loadbalancer profile anymore, we now have haproxy &
keepalived profiles that replace it.

Change-Id: I5bf57f88a85fa8180392e9dde7ab39f4eda63113

diff --git a/manifests/profile/base/loadbalancer.pp b/manifests/profile/base/loadbalancer.pp
deleted file mode 100644 (file)
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/pacemaker/haproxy.pp b/manifests/profile/pacemaker/haproxy.pp
index 58bb174..a7aca58 100644 (file)
--- 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 (file)
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,
-      }
-  }
-
-}