From c93ba28a895a24c8cf14e6475a367152b35f35c4 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Thu, 23 Jun 2016 14:38:16 -0400 Subject: Revert "Ceilometer composable roles for controller" This reverts commit c48410a05ec0ffd11c717bcf350badc9e5f0e910. We've discovered this patch never had passing CI due to a DLRN build failure. Change-Id: I546cb3e340d20701662affda7e28b586c58ba6de --- environments/puppet-pacemaker.yaml | 4 ---- 1 file changed, 4 deletions(-) (limited to 'environments') diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml index 1df02f38..d1df6c41 100644 --- a/environments/puppet-pacemaker.yaml +++ b/environments/puppet-pacemaker.yaml @@ -39,7 +39,3 @@ 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 -- cgit 1.2.3-korg