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 /environments/puppet-pacemaker.yaml | |
| parent | 3d01f650f18b9e4f1892a6d9aa17f1bfc99b5091 (diff) | |
| parent | 244dcc434959eff291b4b6cc41993941db7e001e (diff) | |
Merge "Explode Loadbalancer role into HAproxy + keepalived"
Diffstat (limited to 'environments/puppet-pacemaker.yaml')
| -rw-r--r-- | environments/puppet-pacemaker.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml index 7f261591..e6326453 100644 --- a/environments/puppet-pacemaker.yaml +++ b/environments/puppet-pacemaker.yaml @@ -23,7 +23,7 @@ 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 OS::TripleO::Services::NovaConductor: ../puppet/services/pacemaker/nova-conductor.yaml |