summaryrefslogtreecommitdiffstats
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
-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 e6d8ee6e..9b7b47ef 100644
--- a/puppet/services/disabled/ceilometer-expirer-disabled.yaml
+++ b/puppet/services/disabled/ceilometer-expirer-disabled.yaml
@@ -27,12 +27,24 @@ 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 disabled Ceilometer Expirer role.
+ description: Role data for the disabling Ceilometer Expirer role.
value:
service_name: ceilometer_expirer_disabled
- upgrade_tasks:
- - name: Stop and disable ceilometer_expirer service on upgrade
- tags: step1
- service: name=openstack-ceilometer-expirer state=stopped enabled=no
+ config_settings:
+ map_merge:
+ - get_attr: [CeilometerServiceBase, role_data, config_settings]
+ - ceilometer::expirer::enable_cron: false
+ step_config: |
+ include ::tripleo::profile::base::ceilometer::expirer