aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-resource-registry-puppet.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-06-23 14:38:16 -0400
committerDan Prince <dprince@redhat.com>2016-06-23 14:38:56 -0400
commitc93ba28a895a24c8cf14e6475a367152b35f35c4 (patch)
tree8f70c1a8ee33cfb548ff4878fb2fdc660b91c2e5 /overcloud-resource-registry-puppet.yaml
parenta778a97d28826221edc43a42772ac52515d36b87 (diff)
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
Diffstat (limited to 'overcloud-resource-registry-puppet.yaml')
-rw-r--r--overcloud-resource-registry-puppet.yaml5
1 files changed, 0 insertions, 5 deletions
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