From 321ecf916f51443dbc139356b709f2b9fdd970a1 Mon Sep 17 00:00:00 2001
From: Pradeep Kilambi <pkilambi@redhat.com>
Date: Fri, 2 Jun 2017 16:12:27 +0000
Subject: Fix the disable expirer to remove crontab

Instead of doing this via puppet which has the consequence of including
the step_config and getting included on the host manifest. Lets disable
via ansible upgrade task instead.

Change-Id: I5f1a4019dd635dea67db4313bd06a228ae7bacd4
---
 .../disabled/ceilometer-expirer-disabled.yaml        | 20 ++++----------------
 .../remove-ceilometer-cron-85362e197ba245a0.yaml     |  5 +++++
 2 files changed, 9 insertions(+), 16 deletions(-)
 create mode 100644 releasenotes/notes/remove-ceilometer-cron-85362e197ba245a0.yaml

diff --git a/puppet/services/disabled/ceilometer-expirer-disabled.yaml b/puppet/services/disabled/ceilometer-expirer-disabled.yaml
index 9b7b47ef..7be394b6 100644
--- a/puppet/services/disabled/ceilometer-expirer-disabled.yaml
+++ b/puppet/services/disabled/ceilometer-expirer-disabled.yaml
@@ -27,24 +27,12 @@ parameters:
                  via parameter_defaults in the resource registry.
     type: json
 
-resources:
-  CeilometerServiceBase:
-    type: ../ceilometer-base.yaml
-    properties:
-      ServiceNetMap: {get_param: ServiceNetMap}
-      DefaultPasswords: {get_param: DefaultPasswords}
-      EndpointMap: {get_param: EndpointMap}
-      RoleName: {get_param: RoleName}
-      RoleParameters: {get_param: RoleParameters}
-
 outputs:
   role_data:
     description: Role data for the disabling Ceilometer Expirer role.
     value:
       service_name: ceilometer_expirer_disabled
-      config_settings:
-        map_merge:
-          - get_attr: [CeilometerServiceBase, role_data, config_settings]
-          - ceilometer::expirer::enable_cron: false
-      step_config: |
-        include ::tripleo::profile::base::ceilometer::expirer
+      upgrade_tasks:
+        - name: Remove ceilometer expirer cron tab on upgrade
+          tags: step1
+          shell: '/usr/bin/crontab -u ceilometer -r'
diff --git a/releasenotes/notes/remove-ceilometer-cron-85362e197ba245a0.yaml b/releasenotes/notes/remove-ceilometer-cron-85362e197ba245a0.yaml
new file mode 100644
index 00000000..7854fa5c
--- /dev/null
+++ b/releasenotes/notes/remove-ceilometer-cron-85362e197ba245a0.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - Ceilometer expirer is deprecated in pike. During upgrade, the crontab thats
+    configured with ceilometer user will be removed to ensure the expirer
+    script is not running.
-- 
cgit 1.2.3-korg