summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2017-05-18 16:17:41 -0400
committerEmilien Macchi <emilien@redhat.com>2017-05-29 19:28:19 +0000
commit847a1fe79333f3eb18672a88a5212cbd395b94bf (patch)
tree405ff57f51965b8f7b3cc87670f4ecec0be8ba98
parent7996b2e817b8f53f6e3dc579023e20ef61751c31 (diff)
ceilometer-expirer: remove the crontab during upgrade
When running disabled/ceilometer-expirer.yaml, we want to remove the crontab that used to run ceilometer-expirer binary in periodic way. Let's use Puppet to remove this crontab. We can't easily use Ansible tasks this time, because the Ansible cron module can only remove Crontabs previously managed by Ansible: https://docs.ansible.com/ansible/cron_module.html#examples In this case, Puppet will erase the crontab in Pike. In Queens, we'll be able to remove these environments files since we wouldn't need it anymore. Change-Id: Idb050c3b281d258aea52d6a3ef40441bb9c8bcbe
Notes
Notes (review): Code-Review+2: Alex Schultz <aschultz@redhat.com> Code-Review+2: Pradeep Kilambi <pkilambi@redhat.com> Code-Review+1: zhongshengping <chdzsp@163.com> Code-Review+1: Saravanan KR <skramaja@redhat.com> Code-Review+2: Jiri Stransky <jistr@redhat.com> Workflow+1: Jiri Stransky <jistr@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 30 May 2017 10:21:27 +0000 Reviewed-on: https://review.openstack.org/466096 Project: openstack/tripleo-heat-templates Branch: refs/heads/master
-rw-r--r--puppet/services/disabled/ceilometer-expirer-disabled.yaml22
1 files changed, 17 insertions, 5 deletions
diff --git a/puppet/services/disabled/ceilometer-expirer-disabled.yaml b/puppet/services/disabled/ceilometer-expirer-disabled.yaml
index e6d8ee6..9b7b47e 100644
--- a/puppet/services/disabled/ceilometer-expirer-disabled.yaml
+++ b/puppet/services/disabled/ceilometer-expirer-disabled.yaml
@@ -27,12 +27,24 @@ parameters:
27 via parameter_defaults in the resource registry. 27 via parameter_defaults in the resource registry.
28 type: json 28 type: json
29 29
30resources:
31 CeilometerServiceBase:
32 type: ../ceilometer-base.yaml
33 properties:
34 ServiceNetMap: {get_param: ServiceNetMap}
35 DefaultPasswords: {get_param: DefaultPasswords}
36 EndpointMap: {get_param: EndpointMap}
37 RoleName: {get_param: RoleName}
38 RoleParameters: {get_param: RoleParameters}
39
30outputs: 40outputs:
31 role_data: 41 role_data:
32 description: Role data for the disabled Ceilometer Expirer role. 42 description: Role data for the disabling Ceilometer Expirer role.
33 value: 43 value:
34 service_name: ceilometer_expirer_disabled 44 service_name: ceilometer_expirer_disabled
35 upgrade_tasks: 45 config_settings:
36 - name: Stop and disable ceilometer_expirer service on upgrade 46 map_merge:
37 tags: step1 47 - get_attr: [CeilometerServiceBase, role_data, config_settings]
38 service: name=openstack-ceilometer-expirer state=stopped enabled=no 48 - ceilometer::expirer::enable_cron: false
49 step_config: |
50 include ::tripleo::profile::base::ceilometer::expirer