From ca2efb57616ec88b6028e2921c4f18e8a0b4ec14 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 31 May 2016 08:54:36 -0400 Subject: 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 --- manifests/profile/base/loadbalancer.pp | 28 ++-------------- manifests/profile/base/neutron/midonet.pp | 2 +- manifests/profile/pacemaker/loadbalancer.pp | 52 +++++++++-------------------- 3 files changed, 19 insertions(+), 63 deletions(-) (limited to 'manifests/profile') 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', ''), diff --git a/manifests/profile/pacemaker/loadbalancer.pp b/manifests/profile/pacemaker/loadbalancer.pp index 2f41769..24b1596 100644 --- a/manifests/profile/pacemaker/loadbalancer.pp +++ b/manifests/profile/pacemaker/loadbalancer.pp @@ -54,67 +54,45 @@ class tripleo::profile::pacemaker::loadbalancer ( clone_params => true, } - # TODO(emilien): clean-up old parameter references when - # https://review.openstack.org/#/c/320411/ is merged. - if hiera('tripleo::loadbalancer::controller_virtual_ip', undef) { - $control_vip_real = hiera('tripleo::loadbalancer::controller_virtual_ip') - } else { - $control_vip_real = hiera('controller_virtual_ip') - } + $control_vip = hiera('controller_virtual_ip') tripleo::pacemaker::haproxy_with_vip { 'haproxy_and_control_vip': vip_name => 'control', - ip_address => $control_vip_real, + ip_address => $control_vip, } - if hiera('tripleo::loadbalancer::public_virtual_ip', undef) { - $public_vip_real = hiera('tripleo::loadbalancer::public_virtual_ip') - } else { - $public_vip_real = hiera('public_virtual_ip') - } + $public_vip = hiera('public_virtual_ip') tripleo::pacemaker::haproxy_with_vip { 'haproxy_and_public_vip': - ensure => $public_vip_real and $public_vip_real != $control_vip_real, + ensure => $public_vip and $public_vip != $control_vip, vip_name => 'public', - ip_address => $public_vip_real, + 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_real, + ensure => $redis_vip and $redis_vip != $control_vip, vip_name => 'redis', ip_address => $redis_vip, } - if hiera('tripleo::loadbalancer::internal_api_virtual_ip', undef) { - $internal_api_vip_real = hiera('tripleo::loadbalancer::internal_api_virtual_ip') - } else { - $internal_api_vip_real = hiera('internal_api_virtual_ip') - } + $internal_api_vip = hiera('internal_api_virtual_ip') tripleo::pacemaker::haproxy_with_vip { 'haproxy_and_internal_api_vip': - ensure => $internal_api_vip_real and $internal_api_vip_real != $control_vip_real, + ensure => $internal_api_vip and $internal_api_vip != $control_vip, vip_name => 'internal_api', - ip_address => $internal_api_vip_real, + ip_address => $internal_api_vip, } - if hiera('tripleo::loadbalancer::storage_virtual_ip', undef) { - $storage_vip_real = hiera('tripleo::loadbalancer::storage_virtual_ip') - } else { - $storage_vip_real = hiera('storage_virtual_ip') - } + $storage_vip = hiera('storage_virtual_ip') tripleo::pacemaker::haproxy_with_vip { 'haproxy_and_storage_vip': - ensure => $storage_vip_real and $storage_vip_real != $control_vip_real, + ensure => $storage_vip and $storage_vip != $control_vip, vip_name => 'storage', - ip_address => $storage_vip_real, + ip_address => $storage_vip, } - if hiera('tripleo::loadbalancer::storage_mgmt_virtual_ip', undef) { - $storage_mgmt_vip_real = hiera('tripleo::loadbalancer::storage_mgmt_virtual_ip') - } else { - $storage_mgmt_vip_real = hiera('storage_mgmt_virtual_ip') - } + $storage_mgmt_vip = hiera('storage_mgmt_virtual_ip') tripleo::pacemaker::haproxy_with_vip { 'haproxy_and_storage_mgmt_vip': - ensure => $storage_mgmt_vip_real and $storage_mgmt_vip_real != $control_vip_real, + ensure => $storage_mgmt_vip and $storage_mgmt_vip != $control_vip, vip_name => 'storage_mgmt', - ip_address => $storage_mgmt_vip_real, + ip_address => $storage_mgmt_vip, } } -- cgit 1.2.3-korg