diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2016-05-25 16:24:51 -0400 |
|---|---|---|
| committer | Emilien Macchi <emilien@redhat.com> | 2016-05-30 17:42:38 -0400 |
| commit | b0ec457332912476618c55752041f4440dd2cf68 (patch) | |
| tree | b472998acc49dac1585d23dbce3a902ba9d5f2aa /manifests/profile/base | |
| parent | 7b355dcc63e24dbb730e135b4148e500e6de4233 (diff) | |
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
Diffstat (limited to 'manifests/profile/base')
| -rw-r--r-- | manifests/profile/base/loadbalancer.pp | 15 | ||||
| -rw-r--r-- | manifests/profile/base/neutron/midonet.pp | 4 |
2 files changed, 14 insertions, 5 deletions
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, + } } } } diff --git a/manifests/profile/base/neutron/midonet.pp b/manifests/profile/base/neutron/midonet.pp index 7374c57..60aa006 100644 --- a/manifests/profile/base/neutron/midonet.pp +++ b/manifests/profile/base/neutron/midonet.pp @@ -20,7 +20,7 @@ # # [*vip*] # (Optional) Public Virtual IP Address for this cloud -# Defaults to hiera('tripleo::loadbalancer::public_virtual_ip') +# Defaults to hiera('public_virtual_ip') # # [*keystone_admin_token*] # (Optional) The Keystone Admin Token @@ -68,7 +68,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::neutron::midonet ( - $vip = hiera('tripleo::loadbalancer::public_virtual_ip', ''), + $vip = hiera('public_virtual_ip', 'tripleo::loadbalancer::public_virtual_ip'), $keystone_admin_token = hiera('keystone::admin_token', ''), $zookeeper_client_ip = hiera('neutron::bind_host', ''), $zookeeper_hostnames = hiera('controller_node_names', ''), |