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 --- overcloud-resource-registry-puppet.yaml | 5 ----- 1 file changed, 5 deletions(-) (limited to 'overcloud-resource-registry-puppet.yaml') diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index efcf86ff..e1d95728 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -158,11 +158,6 @@ resource_registry: OS::TripleO::Services::NovaVncproxy: puppet/services/nova-vncproxy.yaml OS::TripleO::Services::NovaCompute: puppet/services/nova-compute.yaml OS::TripleO::Services::Ntp: puppet/services/time/ntp.yaml - OS::TripleO::Services::CeilometerApi: puppet/services/ceilometer-api.yaml - OS::TripleO::Services::CeilometerCollector: puppet/services/ceilometer-collector.yaml - OS::TripleO::Services::CeilometerExpirer: puppet/services/ceilometer-expirer.yaml - OS::TripleO::Services::CeilometerAgentCentral: puppet/services/ceilometer-agent-central.yaml - OS::TripleO::Services::CeilometerAgentNotification: puppet/services/ceilometer-agent-notification.yaml parameter_defaults: EnablePackageInstall: false -- cgit 1.2.3-korg