Merge "Deprecate loabalancer profiles"

3 files changed, 86 insertions, 0 deletions

diff --git a/manifests/profile/base/haproxy.pp b/manifests/profile/base/haproxy.pp
new file mode 100644
index 0000000..31a5415
--- /dev/null
+++ b/manifests/profile/base/haproxy.pp
@@ -0,0 +1,42 @@
+# 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::haproxy
+#
+# 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::haproxy (
+  $enable_load_balancer = hiera('enable_load_balancer', true),
+  $step                 = hiera('step'),
+) {
+
+  if $step >= 1 {
+    if $enable_load_balancer {
+      include ::tripleo::haproxy
+    }
+  }
+
+}
+
diff --git a/manifests/profile/base/keepalived.pp b/manifests/profile/base/keepalived.pp
new file mode 100644
index 0000000..af7c095
--- /dev/null
+++ b/manifests/profile/base/keepalived.pp
@@ -0,0 +1,42 @@
+# 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::keepalived
+#
+# 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::keepalived (
+  $enable_load_balancer = hiera('enable_load_balancer', true),
+  $step                 = hiera('step'),
+) {
+
+  if $step >= 1 {
+    if $enable_load_balancer and hiera('enable_keepalived', true){
+      include ::tripleo::keepalived
+    }
+  }
+
+}
+
diff --git a/manifests/profile/base/loadbalancer.pp b/manifests/profile/base/loadbalancer.pp
index d9e2b15..2f298f0 100644
--- a/manifests/profile/base/loadbalancer.pp
+++ b/manifests/profile/base/loadbalancer.pp
@@ -32,6 +32,8 @@ class tripleo::profile::base::loadbalancer (
   $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