diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-11 20:23:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-11 20:23:24 +0000 |
| commit | cf8b152c31303f7f4c8d562dbbbc3c1399c6c4dd (patch) | |
| tree | 70e21d409e2c45e6c0251bdd3e63126395fda6c0 /environments | |
| parent | 0dd151201f86688ce8cf1773ccacf69932a996c1 (diff) | |
| parent | 81863d101478ec0d74402cbe11127cbb39ce7d5b (diff) | |
Merge "Re-enable Ceilometer composable roles for controller"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/puppet-pacemaker.yaml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml index 8043ccbf..cd97591b 100644 --- a/environments/puppet-pacemaker.yaml +++ b/environments/puppet-pacemaker.yaml @@ -40,3 +40,7 @@ resource_registry: OS::TripleO::Services::NovaScheduler: ../puppet/services/pacemaker/nova-scheduler.yaml OS::TripleO::Services::NovaConsoleauth: ../puppet/services/pacemaker/nova-consoleauth.yaml OS::TripleO::Services::NovaVncproxy: ../puppet/services/pacemaker/nova-vncproxy.yaml + OS::TripleO::Services::CeilometerApi: ../puppet/services/pacemaker/ceilometer-api.yaml + OS::TripleO::Services::CeilometerCollector: ../puppet/services/pacemaker/ceilometer-collector.yaml + OS::TripleO::Services::CeilometerAgentCentral: ../puppet/services/pacemaker/ceilometer-agent-central.yaml + OS::TripleO::Services::CeilometerAgentNotification: ../puppet/services/pacemaker/ceilometer-agent-notification.yaml |