From 244dcc434959eff291b4b6cc41993941db7e001e Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 31 May 2016 16:50:19 -0400 Subject: Explode Loadbalancer role into HAproxy + keepalived Split Loadbalancer into HAproxy & Keepalived roles. Depends-On: I8aa9045fc80205485abab723968b26084f60bf71 Change-Id: If2723358099e78052c351a4a45fdf01d116a89df --- environments/puppet-pacemaker.yaml | 2 +- overcloud-resource-registry-puppet.yaml | 3 ++- overcloud.yaml | 3 ++- puppet/services/haproxy.yaml | 18 +++++++++++++++++ puppet/services/keepalived.yaml | 18 +++++++++++++++++ puppet/services/loadbalancer.yaml | 18 ----------------- puppet/services/pacemaker/haproxy.yaml | 30 +++++++++++++++++++++++++++++ puppet/services/pacemaker/loadbalancer.yaml | 30 ----------------------------- 8 files changed, 71 insertions(+), 51 deletions(-) create mode 100644 puppet/services/haproxy.yaml create mode 100644 puppet/services/keepalived.yaml delete mode 100644 puppet/services/loadbalancer.yaml create mode 100644 puppet/services/pacemaker/haproxy.yaml delete mode 100644 puppet/services/pacemaker/loadbalancer.yaml diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml index def047c0..6f96b047 100644 --- a/environments/puppet-pacemaker.yaml +++ b/environments/puppet-pacemaker.yaml @@ -23,6 +23,6 @@ resource_registry: OS::TripleO::Services::NeutronL3Agent: ../puppet/services/pacemaker/neutron-l3.yaml OS::TripleO::Services::NeutronMetadataAgent: ../puppet/services/pacemaker/neutron-metadata.yaml OS::TripleO::Services::RabbitMQ: ../puppet/services/pacemaker/rabbitmq.yaml - OS::TripleO::Services::Loadbalancer: ../puppet/services/pacemaker/loadbalancer.yaml + OS::TripleO::Services::HAproxy: ../puppet/services/pacemaker/haproxy.yaml OS::TripleO::Services::Memcached: ../puppet/services/pacemaker/memcached.yaml OS::TripleO::Services::Redis: ../puppet/services/pacemaker/database/redis.yaml diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index 7682ad63..3eb2c427 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -136,7 +136,8 @@ resource_registry: OS::TripleO::Services::NeutronL3Agent: puppet/services/neutron-l3.yaml OS::TripleO::Services::NeutronMetadataAgent: puppet/services/neutron-metadata.yaml OS::TripleO::Services::RabbitMQ: puppet/services/rabbitmq.yaml - OS::TripleO::Services::Loadbalancer: puppet/services/loadbalancer.yaml + OS::TripleO::Services::HAproxy: puppet/services/haproxy.yaml + OS::TripleO::Services::Keepalived: puppet/services/keepalived.yaml OS::TripleO::Services::Memcached: puppet/services/memcached.yaml OS::TripleO::Services::SwiftProxy: puppet/services/swift-proxy.yaml OS::TripleO::Services::SaharaApi: puppet/services/sahara-api.yaml diff --git a/overcloud.yaml b/overcloud.yaml index cbab3953..5cab7dcd 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -637,7 +637,8 @@ parameters: - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronMetadataAgent - OS::TripleO::Services::RabbitMQ - - OS::TripleO::Services::Loadbalancer + - OS::TripleO::Services::HAproxy + - OS::TripleO::Services::Keepalived - OS::TripleO::Services::Memcached - OS::TripleO::Services::SwiftProxy - OS::TripleO::Services::Redis diff --git a/puppet/services/haproxy.yaml b/puppet/services/haproxy.yaml new file mode 100644 index 00000000..844637bc --- /dev/null +++ b/puppet/services/haproxy.yaml @@ -0,0 +1,18 @@ +heat_template_version: 2016-04-08 + +description: > + HAproxy service configured with Puppet + +parameters: + EndpointMap: + default: {} + description: Mapping of service endpoint -> protocol. Typically set + via parameter_defaults in the resource registry. + type: json + +outputs: + role_data: + description: Role data for the HAproxy role. + value: + step_config: | + include ::tripleo::profile::base::haproxy diff --git a/puppet/services/keepalived.yaml b/puppet/services/keepalived.yaml new file mode 100644 index 00000000..09ce26b5 --- /dev/null +++ b/puppet/services/keepalived.yaml @@ -0,0 +1,18 @@ +heat_template_version: 2016-04-08 + +description: > + Keepalived service configured with Puppet + +parameters: + EndpointMap: + default: {} + description: Mapping of service endpoint -> protocol. Typically set + via parameter_defaults in the resource registry. + type: json + +outputs: + role_data: + description: Role data for the Keepalived role. + value: + step_config: | + include ::tripleo::profile::base::keepalived diff --git a/puppet/services/loadbalancer.yaml b/puppet/services/loadbalancer.yaml deleted file mode 100644 index 1b9654fc..00000000 --- a/puppet/services/loadbalancer.yaml +++ /dev/null @@ -1,18 +0,0 @@ -heat_template_version: 2016-04-08 - -description: > - Loadbalancer service configured with Puppet - -parameters: - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - -outputs: - role_data: - description: Role data for the Loadbalancer role. - value: - step_config: | - include ::tripleo::profile::base::loadbalancer diff --git a/puppet/services/pacemaker/haproxy.yaml b/puppet/services/pacemaker/haproxy.yaml new file mode 100644 index 00000000..c2ca2816 --- /dev/null +++ b/puppet/services/pacemaker/haproxy.yaml @@ -0,0 +1,30 @@ +heat_template_version: 2016-04-08 + +description: > + HAproxy service with Pacemaker configured with Puppet + +parameters: + EndpointMap: + default: {} + description: Mapping of service endpoint -> protocol. Typically set + via parameter_defaults in the resource registry. + type: json + +resources: + LoadbalancerServiceBase: + type: ../haproxy.yaml + properties: + EndpointMap: {get_param: EndpointMap} + +outputs: + role_data: + description: Role data for the HAproxy with pacemaker role. + value: + config_settings: + map_merge: + - get_attr: [LoadbalancerServiceBase, role_data, config_settings] + - tripleo::haproxy::haproxy_service_manage: false + tripleo::haproxy::mysql_clustercheck: true + enable_keepalived: false + step_config: | + include ::tripleo::profile::pacemaker::haproxy diff --git a/puppet/services/pacemaker/loadbalancer.yaml b/puppet/services/pacemaker/loadbalancer.yaml deleted file mode 100644 index ce67e925..00000000 --- a/puppet/services/pacemaker/loadbalancer.yaml +++ /dev/null @@ -1,30 +0,0 @@ -heat_template_version: 2016-04-08 - -description: > - Loadbalancer service with Pacemaker configured with Puppet - -parameters: - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - -resources: - LoadbalancerServiceBase: - type: ../loadbalancer.yaml - properties: - EndpointMap: {get_param: EndpointMap} - -outputs: - role_data: - description: Role data for the Loadbalancer pacemaker role. - value: - config_settings: - map_merge: - - get_attr: [LoadbalancerServiceBase, role_data, config_settings] - - tripleo::haproxy::haproxy_service_manage: false - tripleo::haproxy::mysql_clustercheck: true - tripleo::haproxy::keepalived: false - step_config: | - include ::tripleo::profile::pacemaker::loadbalancer -- cgit 1.2.3-korg