purge: do not stop ceph.target on each daemon

Doing this cause some all the daemons to go down at the same time. In a
scenario where we colocate a monitor and an osd, this osds will take
some time to go down which will make the 'umount' task fail.

Signed-off-by: Sébastien Han <seb@redhat.com>
pull/1254/head
Sébastien Han 2017-01-27 15:40:41 +01:00
parent cb57a359ba
commit d5dd658cfa
1 changed files with 8 additions and 42 deletions

View File

@ -76,13 +76,6 @@
- include_vars: group_vars/{{ mds_group_name }}.yml
ignore_errors: true
- name: stop ceph.target with systemd
service:
name: ceph.target
state: stopped
enabled: no
when: ansible_service_mgr == 'systemd'
- name: stop ceph mdss with systemd
service:
name: ceph-mds@{{ ansible_hostname }}
@ -120,13 +113,6 @@
- include_vars: group_vars/{{ rgw_group_name }}.yml
ignore_errors: true
- name: stop ceph.target with systemd
service:
name: ceph.target
state: stopped
enabled: no
when: ansible_service_mgr == 'systemd'
- name: stop ceph rgws with systemd
service:
name: ceph-radosgw@rgw.{{ ansible_hostname }}
@ -164,13 +150,6 @@
- include_vars: group_vars/{{ rbdmirror_group_name }}.yml
ignore_errors: true
- name: stop ceph.target with systemd
service:
name: ceph.target
state: stopped
enabled: no
when: ansible_service_mgr == 'systemd'
- name: stop ceph rbd mirror with systemd
service:
name: ceph-rbd-mirror@admin.service
@ -203,13 +182,6 @@
- include_vars: group_vars/{{ nfs_group_name }}.yml
ignore_errors: true
- name: stop ceph.target with systemd
service:
name: ceph.target
state: stopped
enabled: no
when: ansible_service_mgr == 'systemd'
- name: stop ceph nfss with systemd
service:
name: nfs-ganesha
@ -272,13 +244,6 @@
register: osd_ids
changed_when: false
- name: stop ceph.target with systemd
service:
name: ceph.target
state: stopped
enabled: no
when: ansible_service_mgr == 'systemd'
- name: stop ceph-osd with systemd
service:
name: ceph-osd@{{item}}
@ -440,13 +405,6 @@
- include_vars: group_vars/{{ restapi_group_name }}.yml
ignore_errors: true
- name: stop ceph.target with systemd
service:
name: ceph.target
state: stopped
enabled: no
when: ansible_service_mgr == 'systemd'
- name: stop ceph mons with systemd
service:
name: ceph-mon@{{ ansible_hostname }}
@ -520,6 +478,14 @@
state: absent
tasks:
- name: stop ceph.target with systemd
service:
name: ceph.target
state: stopped
enabled: no
when: ansible_service_mgr == 'systemd'
- name: check for anything running ceph
shell: "ps awux | grep -- /usr/bin/[c]eph-"
register: check_for_running_ceph