From c80ba7a307237a44d29990da8e730605bc811685 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Sat, 23 Sep 2017 18:02:49 +0200 Subject: [PATCH] purge: implement mgr purge unti now, mgr nodes are not managed by purge-cluster.yml, therefore it breaks scenario like purge_cluster. Signed-off-by: Guillaume Abrioux --- infrastructure-playbooks/purge-cluster.yml | 24 ++++++++++++ .../purge-docker-cluster.yml | 37 +++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml index df82a3587..2e8c93afc 100644 --- a/infrastructure-playbooks/purge-cluster.yml +++ b/infrastructure-playbooks/purge-cluster.yml @@ -41,6 +41,7 @@ - "{{ rbdmirror_group_name|default('rbdmirrors') }}" - "{{ nfs_group_name|default('nfss') }}" - "{{ client_group_name|default('clients') }}" + - "{{ mgr_group_name|default('mgrs') }}" become: true @@ -77,6 +78,27 @@ failed_when: false when: ansible_service_mgr == 'upstart' +- name: purge ceph mgr cluster + + vars: + mgr_group_name: mgrs + + hosts: + - "{{ mgr_group_name|default('mgrs') }}" + + gather_facts: false # Already gathered previously + + become: true + + tasks: + + - name: stop ceph mgrs with systemd + service: + name: ceph-mgr@{{ ansible_hostname}} + state: stopped + enabled: no + when: ansible_service_mgr == 'systemd' + - name: purge ceph rgw cluster vars: @@ -507,6 +529,7 @@ - ceph-fs-common - ceph-fuse - ceph-mds + - ceph-mgr - ceph-release - ceph-radosgw - calamari-server @@ -529,6 +552,7 @@ - "{{ rbdmirror_group_name|default('rbdmirrors') }}" - "{{ nfs_group_name|default('nfss') }}" - "{{ client_group_name|default('clients') }}" + - "{{ mgr_group_name|default('mgrs') }}" gather_facts: false # Already gathered previously diff --git a/infrastructure-playbooks/purge-docker-cluster.yml b/infrastructure-playbooks/purge-docker-cluster.yml index 5e6917109..abcf7cf1b 100644 --- a/infrastructure-playbooks/purge-docker-cluster.yml +++ b/infrastructure-playbooks/purge-docker-cluster.yml @@ -87,6 +87,41 @@ tags: remove_img +- name: purge ceph mgr cluster + + hosts: + - "{{ mgr_group_name|default('mgrs') }}" + become: true + tasks: + + - name: disable ceph mgr service + service: + name: "ceph-mgr@{{ ansible_hostname }}" + state: stopped + enabled: no + ignore_errors: true + + - name: remove ceph mgr container + docker: + image: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}" + name: "ceph-mgr-{{ ansible_hostname }}" + state: absent + ignore_errors: true + + - name: remove ceph mgr service + file: + path: /etc/systemd/system/ceph-mgr@.service + state: absent + + - name: remove ceph mgr image + docker_image: + state: absent + repository: "{{ ceph_docker_registry }}" + name: "{{ ceph_docker_image }}" + tag: "{{ ceph_docker_image_tag }}" + force: yes + tags: + remove_img - name: purge ceph rgw cluster @@ -361,6 +396,7 @@ - "{{ rgw_group_name|default('rgws') }}" - "{{ rbdmirror_group_name|default('rbdmirrors') }}" - "{{ nfs_group_name|default('nfss') }}" + - "{{ mgr_group_name|default('mgrs') }}" become: true @@ -513,6 +549,7 @@ - "{{ rgw_group_name|default('rgws') }}" - "{{ rbdmirror_group_name|default('rbdmirrors') }}" - "{{ nfs_group_name|default('nfss') }}" + - "{{ mgr_group_name|default('mgrs') }}" gather_facts: false # Already gathered previously -- 2.39.5