From dcd4b2955a8c06bb44fd2b2c5e7b37c29e8ab2f9 Mon Sep 17 00:00:00 2001 From: wujie1993 Date: Sun, 5 Jan 2020 15:31:46 +0800 Subject: [PATCH] purge: fix purge cluster failed Fix purge cluster failed when local container images does not exist. Purge node-exporter and grafana-server only when dashboard_enabled is set to True. Signed-off-by: wujie1993 qq594jj@gmail.com (cherry picked from commit d8b0b3cbd94655a36bbaa828410977eba6b1aa21) --- infrastructure-playbooks/purge-cluster.yml | 127 +++++++++--------- .../purge-container-cluster.yml | 117 ++++++++-------- 2 files changed, 129 insertions(+), 115 deletions(-) diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml index 3f6f71c12..6a3a40623 100644 --- a/infrastructure-playbooks/purge-cluster.yml +++ b/infrastructure-playbooks/purge-cluster.yml @@ -136,26 +136,30 @@ tasks: - import_role: name: ceph-defaults - - import_role: - name: ceph-facts - tasks_from: container_binary - - - name: disable node_exporter service - service: - name: node_exporter - state: stopped - enabled: no - failed_when: false - - - name: remove node_exporter service file - file: - name: /etc/systemd/system/node_exporter.service - state: absent - - name: remove node-exporter image - command: "{{ container_binary }} rmi {{ node_exporter_container_image }}" - tags: - - remove_img + - block: + - import_role: + name: ceph-facts + tasks_from: container_binary + + - name: disable node_exporter service + service: + name: node_exporter + state: stopped + enabled: no + failed_when: false + + - name: remove node_exporter service file + file: + name: /etc/systemd/system/node_exporter.service + state: absent + + - name: remove node-exporter image + command: "{{ container_binary }} rmi {{ node_exporter_container_image }}" + failed_when: false + tags: + - remove_img + when: dashboard_enabled | bool - name: purge ceph grafana-server @@ -170,49 +174,52 @@ tasks: - import_role: name: ceph-defaults - - import_role: - name: ceph-facts - tasks_from: container_binary - - name: stop services - service: - name: "{{ item }}" - state: stopped - enabled: no - with_items: "{{ grafana_services }}" - failed_when: false - - - name: remove service files - file: - name: "/etc/systemd/system/{{ item }}.service" - state: absent - with_items: "{{ grafana_services }}" - failed_when: false + - block: + - import_role: + name: ceph-facts + tasks_from: container_binary + + - name: stop services + service: + name: "{{ item }}" + state: stopped + enabled: no + with_items: "{{ grafana_services }}" + failed_when: false - - name: remove ceph dashboard container images - command: "{{ container_binary }} rmi {{ item }}" - with_items: - - "{{ prometheus_container_image }}" - - "{{ grafana_container_image }}" - - "{{ alertmanager_container_image }}" - failed_when: false - tags: - - remove_img - - - name: remove data - file: - name: "{{ item }}" - state: absent - with_items: - - /etc/grafana/dashboards - - /etc/grafana/grafana.ini - - /etc/grafana/provisioning - - /var/lib/grafana - - /etc/alertmanager - - /var/lib/alertmanager - - /var/lib/prometheus - - /etc/prometheus - failed_when: false + - name: remove service files + file: + name: "/etc/systemd/system/{{ item }}.service" + state: absent + with_items: "{{ grafana_services }}" + failed_when: false + + - name: remove ceph dashboard container images + command: "{{ container_binary }} rmi {{ item }}" + with_items: + - "{{ prometheus_container_image }}" + - "{{ grafana_container_image }}" + - "{{ alertmanager_container_image }}" + failed_when: false + tags: + - remove_img + + - name: remove data + file: + name: "{{ item }}" + state: absent + with_items: + - /etc/grafana/dashboards + - /etc/grafana/grafana.ini + - /etc/grafana/provisioning + - /var/lib/grafana + - /etc/alertmanager + - /var/lib/alertmanager + - /var/lib/prometheus + - /etc/prometheus + failed_when: false + when: dashboard_enabled | bool - name: purge ceph mds cluster diff --git a/infrastructure-playbooks/purge-container-cluster.yml b/infrastructure-playbooks/purge-container-cluster.yml index efdd22e80..dfba25581 100644 --- a/infrastructure-playbooks/purge-container-cluster.yml +++ b/infrastructure-playbooks/purge-container-cluster.yml @@ -378,26 +378,30 @@ tasks: - import_role: name: ceph-defaults - - import_role: - name: ceph-facts - tasks_from: container_binary - - name: disable node_exporter service - service: - name: node_exporter - state: stopped - enabled: no - failed_when: false + - block: + - import_role: + name: ceph-facts + tasks_from: container_binary + + - name: disable node_exporter service + service: + name: node_exporter + state: stopped + enabled: no + failed_when: false - - name: remove node_exporter service file - file: - name: /etc/systemd/system/node_exporter.service - state: absent + - name: remove node_exporter service file + file: + name: /etc/systemd/system/node_exporter.service + state: absent - - name: remove node-exporter image - command: "{{ container_binary }} rmi {{ node_exporter_container_image }}" - tags: - - remove_img + - name: remove node-exporter image + command: "{{ container_binary }} rmi {{ node_exporter_container_image }}" + failed_when: false + tags: + - remove_img + when: dashboard_enabled | bool - name: purge ceph-grafana @@ -416,48 +420,51 @@ tasks: - import_role: name: ceph-defaults - - import_role: - name: ceph-facts - tasks_from: container_binary - - name: stop services - service: - name: "{{ item }}" - state: stopped - enabled: no - with_items: "{{ grafana_services }}" - failed_when: false + - block: + - import_role: + name: ceph-facts + tasks_from: container_binary + + - name: stop services + service: + name: "{{ item }}" + state: stopped + enabled: no + with_items: "{{ grafana_services }}" + failed_when: false - - name: remove service files - file: - name: "/etc/systemd/system/{{ item }}.service" - state: absent - with_items: "{{ grafana_services }}" - failed_when: false + - name: remove service files + file: + name: "/etc/systemd/system/{{ item }}.service" + state: absent + with_items: "{{ grafana_services }}" + failed_when: false - - name: remove ceph dashboard container images - command: "{{ container_binary }} rmi {{ item }}" - with_items: - - "{{ prometheus_container_image }}" - - "{{ grafana_container_image }}" - - "{{ alertmanager_container_image }}" - failed_when: false - tags: - - remove_img + - name: remove ceph dashboard container images + command: "{{ container_binary }} rmi {{ item }}" + with_items: + - "{{ prometheus_container_image }}" + - "{{ grafana_container_image }}" + - "{{ alertmanager_container_image }}" + failed_when: false + tags: + - remove_img - - name: remove data - file: - name: "{{ item }}" - state: absent - with_items: - - /etc/grafana/grafana.ini - - /etc/grafana/provisioning - - /var/lib/grafana - - /etc/alertmanager - - /var/lib/alertmanager - - /var/lib/prometheus - - /etc/prometheus - failed_when: false + - name: remove data + file: + name: "{{ item }}" + state: absent + with_items: + - /etc/grafana/grafana.ini + - /etc/grafana/provisioning + - /var/lib/grafana + - /etc/alertmanager + - /var/lib/alertmanager + - /var/lib/prometheus + - /etc/prometheus + failed_when: false + when: dashboard_enabled | bool - name: check container hosts -- 2.39.5