diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-07 13:22:28 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-07 13:22:28 -0800 |
| commit | 5a3fdd11e8ba92693b7c842e3210c40a76fe5b15 (patch) | |
| tree | 64aad461ffb9b5c75eaa8aba582a62b28356b29e | |
| parent | e4cbec17b2a2913c38c67f913c739b5f0772d0dd (diff) | |
| parent | e9549dc5f790effe158e130bbe4eec869ddbab0f (diff) | |
| download | openshift-5a3fdd11e8ba92693b7c842e3210c40a76fe5b15.tar.gz openshift-5a3fdd11e8ba92693b7c842e3210c40a76fe5b15.tar.bz2 openshift-5a3fdd11e8ba92693b7c842e3210c40a76fe5b15.tar.xz openshift-5a3fdd11e8ba92693b7c842e3210c40a76fe5b15.zip | |
Merge pull request #7044 from zgalor/fix_uninstall_bug
Automatic merge from submit-queue.
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
| -rw-r--r-- | playbooks/openshift-prometheus/private/uninstall.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_prometheus/tasks/uninstall_prometheus.yaml (renamed from roles/openshift_prometheus/tasks/uninstall.yaml) | 0 |
2 files changed, 1 insertions, 1 deletions
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_prometheus.yaml index d746402db..d746402db 100644 --- a/roles/openshift_prometheus/tasks/uninstall.yaml +++ b/roles/openshift_prometheus/tasks/uninstall_prometheus.yaml |