diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-06 13:59:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-06 13:59:18 +0000 |
| commit | eef24da48592154bc29f748a09e7fd23ced9e776 (patch) | |
| tree | e6fcce6ccfe04f655900647579dc2437c518b303 /puppet/services/pacemaker | |
| parent | 3d01f650f18b9e4f1892a6d9aa17f1bfc99b5091 (diff) | |
| parent | 244dcc434959eff291b4b6cc41993941db7e001e (diff) | |
Merge "Explode Loadbalancer role into HAproxy + keepalived"
Diffstat (limited to 'puppet/services/pacemaker')
| -rw-r--r-- | puppet/services/pacemaker/haproxy.yaml (renamed from puppet/services/pacemaker/loadbalancer.yaml) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/puppet/services/pacemaker/loadbalancer.yaml b/puppet/services/pacemaker/haproxy.yaml index ce67e925..c2ca2816 100644 --- a/puppet/services/pacemaker/loadbalancer.yaml +++ b/puppet/services/pacemaker/haproxy.yaml @@ -1,7 +1,7 @@ heat_template_version: 2016-04-08 description: > - Loadbalancer service with Pacemaker configured with Puppet + HAproxy service with Pacemaker configured with Puppet parameters: EndpointMap: @@ -12,19 +12,19 @@ parameters: resources: LoadbalancerServiceBase: - type: ../loadbalancer.yaml + type: ../haproxy.yaml properties: EndpointMap: {get_param: EndpointMap} outputs: role_data: - description: Role data for the Loadbalancer pacemaker role. + 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 - tripleo::haproxy::keepalived: false + enable_keepalived: false step_config: | - include ::tripleo::profile::pacemaker::loadbalancer + include ::tripleo::profile::pacemaker::haproxy |