summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorPradeep Kilambi <pkilambi@redhat.com>2017-05-10 13:09:12 -0400
committerPradeep Kilambi <pkilambi@redhat.com>2017-05-11 11:44:48 -0400
commit66b39c2c21b6629222c0d212642156437119e977 (patch)
treeb8d66f436c350205c97c357132f2918ebff6e62a /puppet
parentbb7a45226e5a6bb3574e8dbc7a5dd8183dd17703 (diff)
Deprecate Ceilometer Expirer
We dont need expirer unless we have collector and standard storage enabled. Lets turn it off by default and make it an optional service. In upgrade scenario, we will kill the process and stop the expirer, unless explicitly enabled. Change-Id: Icffb7d1bb2cf7bd61026be7d2dcfbd70cd3bcbda
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/ceilometer-expirer.yaml2
-rw-r--r--puppet/services/disabled/ceilometer-expirer.yaml30
2 files changed, 32 insertions, 0 deletions
diff --git a/puppet/services/ceilometer-expirer.yaml b/puppet/services/ceilometer-expirer.yaml
index 714434b1..eb22f33e 100644
--- a/puppet/services/ceilometer-expirer.yaml
+++ b/puppet/services/ceilometer-expirer.yaml
@@ -2,6 +2,8 @@ heat_template_version: ocata
description: >
OpenStack Ceilometer Expirer service configured with Puppet
+ Note, This service is deprecated and will be removed in
+ future releases.
parameters:
ServiceNetMap:
diff --git a/puppet/services/disabled/ceilometer-expirer.yaml b/puppet/services/disabled/ceilometer-expirer.yaml
new file mode 100644
index 00000000..ec018e4f
--- /dev/null
+++ b/puppet/services/disabled/ceilometer-expirer.yaml
@@ -0,0 +1,30 @@
+heat_template_version: pike
+
+description: >
+ OpenStack Ceilometer Expirer service, disabled since pike
+
+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
+
+outputs:
+ role_data:
+ description: Role data for the disabled Ceilometer Expirer role.
+ value:
+ service_name: ceilometer_expirer
+ upgrade_tasks:
+ - name: Stop and disable ceilometer_expirer service on upgrade
+ tags: step1
+ service: name=openstack-ceilometer-expirer state=stopped enabled=no