From aac79df3b376afcb70b4e8888a72ad016079576b Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Fri, 21 Apr 2017 15:11:03 -0700 Subject: [PATCH 1/4] purge-cluster: no need to remove ceph.target The package uninstalls will stop ceph.target Signed-off-by: Andrew Schoen --- infrastructure-playbooks/purge-cluster.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml index 89291cad5..73d9ee787 100644 --- a/infrastructure-playbooks/purge-cluster.yml +++ b/infrastructure-playbooks/purge-cluster.yml @@ -423,13 +423,6 @@ 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 From 7ca2bddcce76dd505b169457fa8727b62b861756 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Fri, 21 Apr 2017 15:12:46 -0700 Subject: [PATCH 2/4] purge-cluster: do not need to check for running ceph processes Signed-off-by: Andrew Schoen --- infrastructure-playbooks/purge-cluster.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml index 73d9ee787..141c66e39 100644 --- a/infrastructure-playbooks/purge-cluster.yml +++ b/infrastructure-playbooks/purge-cluster.yml @@ -423,11 +423,6 @@ tasks: - - name: check for anything running ceph - shell: "ps awux | grep -- /usr/bin/[c]eph-" - register: check_for_running_ceph - failed_when: check_for_running_ceph.rc == 0 - - name: purge ceph packages with yum yum: name: "{{ item }}" From 26bdd59f5d445db7991eecd0d13f7c8615bc4812 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Fri, 21 Apr 2017 15:14:38 -0700 Subject: [PATCH 3/4] purge-cluster: we don't support sysv or upstart anymore Now that ceph-ansible only supports > jewel we don't need to bother with sysv or upstart Signed-off-by: Andrew Schoen --- infrastructure-playbooks/purge-cluster.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml index 141c66e39..4b6c03ceb 100644 --- a/infrastructure-playbooks/purge-cluster.yml +++ b/infrastructure-playbooks/purge-cluster.yml @@ -481,19 +481,6 @@ path: /var/log/ceph state: absent - - name: remove from sysv - shell: "update-rc.d -f ceph remove" - when: ansible_service_mgr == 'sysvinit' - - - name: remove upstart and sysv files - shell: "find /etc -name '*ceph*' -delete" - when: ansible_service_mgr == 'upstart' - - - name: remove upstart and apt logs and cache - shell: "find /var -name '*ceph*' -delete" - failed_when: false - when: ansible_distribution == 'Ubuntu' - - name: request data removal local_action: shell echo requesting data removal become: false From 5a3f95dfc1bc9bba7ad62999969997ce0a27da13 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Tue, 25 Apr 2017 07:35:13 -0500 Subject: [PATCH 4/4] purge-cluster: check for any running ceph process after purge Signed-off-by: Andrew Schoen --- infrastructure-playbooks/purge-cluster.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml index 4b6c03ceb..5a756fd92 100644 --- a/infrastructure-playbooks/purge-cluster.yml +++ b/infrastructure-playbooks/purge-cluster.yml @@ -506,6 +506,11 @@ state: absent when: ansible_os_family == 'RedHat' + - name: check for anything running ceph + command: "ps -u ceph -U ceph" + register: check_for_running_ceph + failed_when: check_for_running_ceph.rc == 0 + - name: purge fetch directory