From e9549dc5f790effe158e130bbe4eec869ddbab0f Mon Sep 17 00:00:00 2001 From: Zohar Galor Date: Wed, 7 Feb 2018 15:24:36 +0200 Subject: Fix uninstall using openshift_prometheus_state=absent This was broken in https://github.com/openshift/openshift-ansible/pull/6811 bz: https://bugzilla.redhat.com/show_bug.cgi?id=1540806 --- playbooks/openshift-prometheus/private/uninstall.yml | 2 +- roles/openshift_prometheus/tasks/uninstall.yaml | 7 ------- roles/openshift_prometheus/tasks/uninstall_prometheus.yaml | 7 +++++++ 3 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 roles/openshift_prometheus/tasks/uninstall.yaml create mode 100644 roles/openshift_prometheus/tasks/uninstall_prometheus.yaml diff --git a/playbooks/openshift-prometheus/private/uninstall.yml b/playbooks/openshift-prometheus/private/uninstall.yml index 2df39c2a8..b01f7f988 100644 --- a/playbooks/openshift-prometheus/private/uninstall.yml +++ b/playbooks/openshift-prometheus/private/uninstall.yml @@ -5,4 +5,4 @@ - name: Run the Prometheus Uninstall Role Tasks include_role: name: openshift_prometheus - tasks_from: uninstall + tasks_from: uninstall_prometheus diff --git a/roles/openshift_prometheus/tasks/uninstall.yaml b/roles/openshift_prometheus/tasks/uninstall.yaml deleted file mode 100644 index d746402db..000000000 --- a/roles/openshift_prometheus/tasks/uninstall.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -# remove namespace - This will delete all the objects inside the namespace -- name: Remove prometheus project - oc_project: - state: absent - name: "{{ openshift_prometheus_namespace }}" diff --git a/roles/openshift_prometheus/tasks/uninstall_prometheus.yaml b/roles/openshift_prometheus/tasks/uninstall_prometheus.yaml new file mode 100644 index 000000000..d746402db --- /dev/null +++ b/roles/openshift_prometheus/tasks/uninstall_prometheus.yaml @@ -0,0 +1,7 @@ +--- + +# remove namespace - This will delete all the objects inside the namespace +- name: Remove prometheus project + oc_project: + state: absent + name: "{{ openshift_prometheus_namespace }}" -- cgit v1.2.3