diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2016-05-31 08:54:36 -0400 |
|---|---|---|
| committer | Emilien Macchi <emilien@redhat.com> | 2016-06-02 22:23:07 -0400 |
| commit | ca2efb57616ec88b6028e2921c4f18e8a0b4ec14 (patch) | |
| tree | c0bf4fffc62b9551ac0821299a549b1077fcc48a /manifests/profile/base | |
| parent | 4529b60bdebb6168c08b1d46873287dc7770981a (diff) | |
Remove tripleo::loadbalancer
The split has been done on both undercloud & overcloud, they now use
tripleo::haproxy and tripleo::keepalived. We can move forward with
removing tripleo::loadbalancer and tripleo::loadbalancer::endpoint, not
used anymore.
Simplify tripleo::profile::base::loadbalancer to just include
tripleo::haproxy and rely on Hiera for parameters.
Change-Id: Ieeb1e94117ae9cb8b11320306de3a9b236bd989a
Diffstat (limited to 'manifests/profile/base')
| -rw-r--r-- | manifests/profile/base/loadbalancer.pp | 28 | ||||
| -rw-r--r-- | manifests/profile/base/neutron/midonet.pp | 2 |
2 files changed, 4 insertions, 26 deletions
diff --git a/manifests/profile/base/loadbalancer.pp b/manifests/profile/base/loadbalancer.pp index e5a0f48..d9e2b15 100644 --- a/manifests/profile/base/loadbalancer.pp +++ b/manifests/profile/base/loadbalancer.pp @@ -27,36 +27,14 @@ # (Optional) Whether or not loadbalancer is enabled. # Defaults to hiera('enable_load_balancer', true). # -# [*controller_node_ips*] -# (Optional) List of IPs for controller nodes. -# Defaults to split(hiera('controller_node_ips'), ',')). -# -# [*controller_node_names*] -# (Optional) List of hostnames for controller nodes. -# Defaults to split(downcase(hiera('controller_node_names')), ','). -# class tripleo::profile::base::loadbalancer ( - $enable_load_balancer = hiera('enable_load_balancer', true), - $controller_node_ips = split(hiera('controller_node_ips'), ','), - $controller_node_names = split(downcase(hiera('controller_node_names')), ','), - $step = hiera('step'), + $enable_load_balancer = hiera('enable_load_balancer', true), + $step = hiera('step'), ) { if $step >= 1 { if $enable_load_balancer { - # 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, - } - } + include ::tripleo::haproxy } } diff --git a/manifests/profile/base/neutron/midonet.pp b/manifests/profile/base/neutron/midonet.pp index 60aa006..972856f 100644 --- a/manifests/profile/base/neutron/midonet.pp +++ b/manifests/profile/base/neutron/midonet.pp @@ -68,7 +68,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::neutron::midonet ( - $vip = hiera('public_virtual_ip', 'tripleo::loadbalancer::public_virtual_ip'), + $vip = hiera('public_virtual_ip'), $keystone_admin_token = hiera('keystone::admin_token', ''), $zookeeper_client_ip = hiera('neutron::bind_host', ''), $zookeeper_hostnames = hiera('controller_node_names', ''), |