From d9986387f592059de0203a93dcbebd4df92b088a Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Sun, 18 Dec 2016 11:05:21 +0100 Subject: Remove unused pacemaker profiles With change I80c8559bb2d915385bcc20ae71fe144ddd6591c1 we removed all the unused puppet-tripleo pacemaker profiles. With this change we remove the corresponding puppet profiles from tripleo-heat-templates. We can also remove any trace of the fake ::Core service as it was introduced via Iacd94294b8a66bc082bb2b3e8d3364ec1bf053b8 for the fake openstack-core pacemaker resource during the Mitaka cycle and became unused in Newton. Change-Id: I48cd2b6a4593d673d5883b45feae088392e7e713 --- .../services/pacemaker/ceilometer-collector.yaml | 45 ---------------------- 1 file changed, 45 deletions(-) delete mode 100644 puppet/services/pacemaker/ceilometer-collector.yaml (limited to 'puppet/services/pacemaker/ceilometer-collector.yaml') diff --git a/puppet/services/pacemaker/ceilometer-collector.yaml b/puppet/services/pacemaker/ceilometer-collector.yaml deleted file mode 100644 index 0ddd72c3..00000000 --- a/puppet/services/pacemaker/ceilometer-collector.yaml +++ /dev/null @@ -1,45 +0,0 @@ -heat_template_version: ocata - -description: > - OpenStack Ceilometer Collector service with Pacemaker configured with Puppet - -parameters: - ServiceNetMap: - default: {} - description: Mapping of service_name -> network name. Typically set - via parameter_defaults in the resource registry. This - mapping overrides those in ServiceNetMapDefaults. - type: json - DefaultPasswords: - default: {} - type: json - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - MonitoringSubscriptionCeilometerCollector: - default: 'overcloud-ceilometer-collector' - type: string - -resources: - CeilometerServiceBase: - type: ../ceilometer-collector.yaml - properties: - ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} - EndpointMap: {get_param: EndpointMap} - -outputs: - role_data: - description: Role data for the Ceilometer Collector pacemaker role. - value: - service_name: ceilometer_collector - monitoring_subscription: {get_param: MonitoringSubscriptionCeilometerCollector} - config_settings: - map_merge: - - get_attr: [CeilometerServiceBase, role_data, config_settings] - - ceilometer::collector::manage_service: false - ceilometer::collector::enabled: false - step_config: | - include ::tripleo::profile::pacemaker::ceilometer::collector -- cgit 1.2.3-korg