aboutsummaryrefslogtreecommitdiffstats
path: root/environments/puppet-pacemaker.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-05-11 12:48:35 +0000
committerGerrit Code Review <review@openstack.org>2016-05-11 12:48:35 +0000
commit0d3dacec4b63fb168f4f039501dc6e7b9622315b (patch)
tree7a4d9deadd321757a8153c4e649b09585e273d68 /environments/puppet-pacemaker.yaml
parentc2cd6f01dc18901a33bd04ffe71ef00613fc3744 (diff)
parent27f7d220bd5a9d0a1deebe16dd1d6a3dee11af82 (diff)
Merge "composable neutron dhcp service"
Diffstat (limited to 'environments/puppet-pacemaker.yaml')
-rw-r--r--environments/puppet-pacemaker.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml
index 2e6e5ec9..48e93a0c 100644
--- a/environments/puppet-pacemaker.yaml
+++ b/environments/puppet-pacemaker.yaml
@@ -12,3 +12,4 @@ resource_registry:
OS::TripleO::Services::Keystone: ../puppet/services/pacemaker/keystone.yaml
OS::TripleO::Services::GlanceApi: ../puppet/services/pacemaker/glance-api.yaml
OS::TripleO::Services::GlanceRegistry: ../puppet/services/pacemaker/glance-registry.yaml
+ OS::TripleO::Services::NeutronDhcpAgent: ../puppet/services/pacemaker/neutron-dhcp.yaml