openstack/tripleo-heat-templates
Code Issues Proposed changes

Fix the disable expirer to remove crontab

Browse Source 
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
This commit is contained in:
Pradeep Kilambi 2017-06-02 16:12:27 +00:00
parent 3c98a1bc3f
commit 321ecf916f
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
puppet/services/disabled/ceilometer-expirer-disabled.yaml
View File

@ -27,24 +27,12 @@ parameters:
via parameter_defaults in the resource registry. via parameter_defaults in the resource registry.
type: json 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: outputs:
role_data: role_data:
description: Role data for the disabling Ceilometer Expirer role. description: Role data for the disabling Ceilometer Expirer role.
value: value:
service_name: ceilometer_expirer_disabled service_name: ceilometer_expirer_disabled
config_settings: upgrade_tasks:
map_merge: - name: Remove ceilometer expirer cron tab on upgrade
- get_attr: [CeilometerServiceBase, role_data, config_settings] tags: step1
- ceilometer::expirer::enable_cron: false shell: '/usr/bin/crontab -u ceilometer -r'
step_config: |
include ::tripleo::profile::base::ceilometer::expirer

5
releasenotes/notes/remove-ceilometer-cron-85362e197ba245a0.yaml Normal file
View File

@ -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.