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 /overcloud-resource-registry-puppet.yaml | |
| parent | 3d01f650f18b9e4f1892a6d9aa17f1bfc99b5091 (diff) | |
| parent | 244dcc434959eff291b4b6cc41993941db7e001e (diff) | |
Merge "Explode Loadbalancer role into HAproxy + keepalived"
Diffstat (limited to 'overcloud-resource-registry-puppet.yaml')
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index 5b6ccbca..2fd48dda 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 |