diff options
author | Pradeep Kilambi <pkilambi@redhat.com> | 2017-06-02 16:12:27 +0000 |
---|---|---|
committer | Pradeep Kilambi <pkilambi@redhat.com> | 2017-06-07 15:00:12 -0400 |
commit | 321ecf916f51443dbc139356b709f2b9fdd970a1 (patch) | |
tree | cc77da6833396d72867579ef35704c7177b37707 /puppet/services | |
parent | 3c98a1bc3f13c2b38fa2b34a1b4c9f8675773f32 (diff) |
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
Diffstat (limited to 'puppet/services')
-rw-r--r-- | puppet/services/disabled/ceilometer-expirer-disabled.yaml | 20 |
1 files changed, 4 insertions, 16 deletions
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' |