diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-10 14:47:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-10 14:47:19 +0000 |
| commit | d7fd9b075fad85efe4ab7809d4e1e66b3ae6c196 (patch) | |
| tree | 45f8ca781df16a4e68489bd9aefb337d000adbc5 /environments/puppet-pacemaker.yaml | |
| parent | a671a30b5196aa5953576928be526d70aed265fe (diff) | |
| parent | 89fbd07afef275e0f818d3575fd0be4a1d4248cf (diff) | |
Merge "composable neutron ml2 and ovs agent"
Diffstat (limited to 'environments/puppet-pacemaker.yaml')
| -rw-r--r-- | environments/puppet-pacemaker.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml index 3e24f988..b139fc8d 100644 --- a/environments/puppet-pacemaker.yaml +++ b/environments/puppet-pacemaker.yaml @@ -23,6 +23,8 @@ 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::NeutronServer: ../puppet/services/pacemaker/neutron-server.yaml + OS::TripleO::Services::NeutronCorePlugin: ../puppet/services/pacemaker/neutron-plugin-ml2.yaml + OS::TripleO::Services::NeutronOvsAgent: ../puppet/services/pacemaker/neutron-ovs-agent.yaml OS::TripleO::Services::RabbitMQ: ../puppet/services/pacemaker/rabbitmq.yaml OS::TripleO::Services::HAproxy: ../puppet/services/pacemaker/haproxy.yaml OS::TripleO::Services::Memcached: ../puppet/services/pacemaker/memcached.yaml |