openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add fast_forward_upgrade_tasks for ceilometer services"

Browse Source
This commit is contained in:
Zuul 2018-03-08 13:29:26 +00:00 committed by Gerrit Code Review
commit 48c1cbf43b
7 changed files with 112 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
docker/services/ceilometer-agent-central.yaml
View File

@ -163,3 +163,23 @@ outputs:
when:
- step|int == 2
- remove_ceilometer_central_package|bool
fast_forward_upgrade_tasks:
- name: FFU check if openstack-ceilometer-central is deployed
command: systemctl is-enabled --quiet openstack-ceilometer-central
ignore_errors: True
register: ceilometer_agent_central_enabled_result
when:
- step|int == 0
- release == 'ocata'
- name: Set fact ceilometer_agent_central_enabled
set_fact:
ceilometer_agent_central_enabled: "{{ ceilometer_agent_central_enabled_result.rc == 0 }}"
when:
- step|int == 0
- release == 'ocata'
- name: FFU stop and disable openstack-ceilometer-central service
service: name=openstack-ceilometer-central state=stopped enabled=no
when:
- step|int == 1
- release == 'ocata'
- ceilometer_agent_central_enabled|bool

20
docker/services/ceilometer-agent-compute.yaml
View File

@ -158,3 +158,23 @@ outputs:
when:
- step|int == 2
- remove_ceilometer_compute_polling_package|bool
fast_forward_upgrade_tasks:
- name: FFU check if openstack-ceilometer-compute is deployed
command: systemctl is-enabled openstack-ceilometer-compute
ignore_errors: True
register: ceilometer_agent_compute_enabled_result
when:
- step|int == 0
- release == 'ocata'
- name: Set fact ceilometer_agent_compute_enabled
set_fact:
ceilometer_agent_compute_enabled: "{{ ceilometer_agent_compute_enabled_result.rc == 0 }}"
when:
- step|int == 0
- release == 'ocata'
- name: FFU stop and disable openstack-ceilometer-compute service
when:
- step|int == 1
- release == 'ocata'
- ceilometer_agent_compute_enabled|bool
service: name=openstack-ceilometer-compute state=stopped enabled=no

20
docker/services/ceilometer-agent-ipmi.yaml
View File

@ -144,3 +144,23 @@ outputs:
when:
- step|int == 2
- remove_ceilometer_ipmi_package|bool
fast_forward_upgrade_tasks:
- name: FFU check if openstack-ceilometer-ipmi is enabled
command: systemctl is-enabled openstack-ceilometer-ipmi
ignore_errors: True
register: ceilometer_ipmi_enabled_result
when:
- step|int == 0
- release == 'ocata'
- name: Set fact ceilometer_ipmi_enabled
set_fact:
ceilometer_ipmi_enabled: "{{ ceilometer_ipmi_enabled_result.rc == 0 }}"
when:
- step|int == 0
- release == 'ocata'
- name: FFU stop and disable openstack-ceilometer-ipmi service
when:
- step|int == 1
- release == 'ocata'
- ceilometer_ipmi_enabled|bool
service: name=openstack-ceilometer-ipmi state=stopped enabled=no

20
docker/services/ceilometer-agent-notification.yaml
View File

@ -154,3 +154,23 @@ outputs:
when:
- step|int == 2
- remove_ceilometer_notification_package|bool
fast_forward_upgrade_tasks:
- name: FFU check if openstack-ceilometer-notification is deployed
command: systemctl is-enabled openstack-ceilometer-notification
ignore_errors: True
register: ceilometer_agent_notification_enabled_result
when:
- step|int == 0
- release == 'ocata'
- name: Set fact ceilometer_agent_notification_enabled
set_fact:
ceilometer_agent_notification_enabled: "{{ ceilometer_agent_notification_enabled_result.rc == 0 }}"
when:
- step|int == 0
- release == 'ocata'
- name: FFU stop and diable openstack-ceilometer-notification service
when:
- step|int == 1
- release == 'ocata'
- ceilometer_agent_notification_enabled|bool
service: name=openstack-ceilometer-notification state=stopped enabled=no

8
puppet/services/disabled/ceilometer-api-disabled.yaml
View File

@ -39,7 +39,11 @@ outputs:
fast_forward_upgrade_tasks:
- name: Purge Ceilometer apache config files
file: path=/etc/httpd/conf.d/10-ceilometer_wsgi.conf state=absent
when: step|int == 1
when:
- step|int == 1
- release == 'ocata'
- name: Clean up ceilometer port from ports.conf
lineinfile: dest=/etc/httpd/conf/ports.conf state=absent regexp="8777$"
when: step|int == 1
when:
- step|int == 1
- release == 'ocata'

18
puppet/services/disabled/ceilometer-collector-disabled.yaml
View File

@ -37,6 +37,22 @@ outputs:
value:
service_name: ceilometer_collector_disabled
fast_forward_upgrade_tasks:
- name: FFU check if openstack-ceilometer-collector is deployed
command: systemctl is-enabled --quiet openstack-ceilometer-collector
ignore_errors: True
register: ceilometer_agent_collector_enabled_result
when:
- step|int == 0
- release == 'ocata'
- name: Set fact ceilometer_agent_collector_enabled
set_fact:
ceilometer_agent_collector_enabled: "{{ ceilometer_agent_collector_enabled_result.rc == 0 }}"
when:
- step|int == 0
- release == 'ocata'
- name: Stop and disable ceilometer_collector service on upgrade
service: name=openstack-ceilometer-collector state=stopped enabled=no
when: step|int == 2
when:
- step|int == 1
- release == 'ocata'
- ceilometer_agent_collector_enabled|bool

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

@ -40,5 +40,12 @@ outputs:
- name: Remove ceilometer expirer cron tab on upgrade
shell: '/usr/bin/crontab -u ceilometer -r'
register: remove_ceilometer_expirer_crontab
failed_when: (remove_ceilometer_expirer_crontab.rc != 0) and (remove_ceilometer_expirer_crontab.stderr != "no crontab for ceilometer") and (step|int == 1)
changed_when: (remove_ceilometer_expirer_crontab.stderr != "no crontab for ceilometer") and (step|int == 1)
failed_when:
- step|int == 1
- release == 'ocata'
- remove_ceilometer_expirer_crontab.rc != 0
- remove_ceilometer_expirer_crontab.stderr != "no crontab for ceilometer"
changed_when:
- step|int == 1
- release == 'ocata'
- remove_ceilometer_expirer_crontab.stderr != "no crontab for ceilometer"