Revert "Ceilometer composable roles for controller"
authorDan Prince <dprince@redhat.com>
Thu, 23 Jun 2016 18:38:16 +0000 (14:38 -0400)
committerDan Prince <dprince@redhat.com>
Thu, 23 Jun 2016 18:38:56 +0000 (14:38 -0400)
commitc93ba28a895a24c8cf14e6475a367152b35f35c4
tree8f70c1a8ee33cfb548ff4878fb2fdc660b91c2e5
parenta778a97d28826221edc43a42772ac52515d36b87
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
16 files changed:
environments/puppet-pacemaker.yaml
overcloud-resource-registry-puppet.yaml
overcloud.yaml
puppet/controller.yaml
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp
puppet/services/ceilometer-agent-central.yaml [deleted file]
puppet/services/ceilometer-agent-notification.yaml [deleted file]
puppet/services/ceilometer-api.yaml [deleted file]
puppet/services/ceilometer-base.yaml [deleted file]
puppet/services/ceilometer-collector.yaml [deleted file]
puppet/services/ceilometer-expirer.yaml [deleted file]
puppet/services/pacemaker/ceilometer-agent-central.yaml [deleted file]
puppet/services/pacemaker/ceilometer-agent-notification.yaml [deleted file]
puppet/services/pacemaker/ceilometer-api.yaml [deleted file]
puppet/services/pacemaker/ceilometer-collector.yaml [deleted file]