From b0ec457332912476618c55752041f4440dd2cf68 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 25 May 2016 16:24:51 -0400 Subject: Update profiles for loadbalancer split Update loadbalancer (nonha and ha) and midonet profiles to consume new tripleo::haproxy class. Keep it backward compatible with old interface until we update THT by using stdlib function: pick. So we first try to get new parameters otherwise we fallback to the old interface. Change-Id: I46ed8348dc990d9aa0d896e1abea3b30a8292634 --- manifests/profile/base/loadbalancer.pp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'manifests/profile/base/loadbalancer.pp') diff --git a/manifests/profile/base/loadbalancer.pp b/manifests/profile/base/loadbalancer.pp index 2a961c4..e5a0f48 100644 --- a/manifests/profile/base/loadbalancer.pp +++ b/manifests/profile/base/loadbalancer.pp @@ -44,9 +44,18 @@ class tripleo::profile::base::loadbalancer ( if $step >= 1 { if $enable_load_balancer { - class { '::tripleo::loadbalancer': - controller_hosts => $controller_node_ips, - controller_hosts_names => $controller_node_names, + # TODO(emilien): remove this conditional once + # https://review.openstack.org/#/c/320411/ is merged. + if hiera('tripleo::loadbalancer::keystone_admin', undef) { + class { '::tripleo::loadbalancer': + controller_hosts => $controller_node_ips, + controller_hosts_names => $controller_node_names, + } + } else { + class { '::tripleo::haproxy': + controller_hosts => $controller_node_ips, + controller_hosts_names => $controller_node_names, + } } } } -- cgit 1.2.3-korg