Merge pull request #5189 from wozniakjan/logging_purge_uninstall

Merged by openshift-bot

roles/openshift_logging/README.md

@@ -15,12 +15,11 @@ to the list of persisted [node labels](https://docs.openshift.org/latest/install
 ###Required vars:
 
 - `openshift_logging_install_logging`: When `True` the `openshift_logging` role will install Aggregated Logging.
-- `openshift_logging_upgrade_logging`:  When `True` the `openshift_logging` role will upgrade Aggregated Logging.
 
-When both `openshift_logging_install_logging` and `openshift_logging_upgrade_logging` are `False` the `openshift_logging` role will uninstall Aggregated Logging.
+When `openshift_logging_install_logging` is set to `False` the `openshift_logging` role will uninstall Aggregated Logging.
 
 ###Optional vars:
-
+- `openshift_logging_purge_logging`: When `openshift_logging_install_logging` is set to 'False' to trigger uninstalation and `openshift_logging_purge_logging` is set to 'True', it will completely and irreversibly remove all logging persistent data including PVC. Defaults to 'False'.
 - `openshift_logging_image_prefix`: The prefix for the logging images to use. Defaults to 'docker.io/openshift/origin-'.
 - `openshift_logging_curator_image_prefix`: Setting the image prefix for Curator image. Defaults to `openshift_logging_image_prefix`.
 - `openshift_logging_elasticsearch_image_prefix`: Setting the image prefix for Elasticsearch image. Defaults to `openshift_logging_image_prefix`.

roles/openshift_logging/defaults/main.yml

@@ -8,6 +8,7 @@ openshift_logging_labels: {}
 openshift_logging_label_key: ""
 openshift_logging_label_value: ""
 openshift_logging_install_logging: True
+openshift_logging_purge_logging: False
 openshift_logging_image_pull_secret: "{{ openshift_hosted_logging_image_pull_secret | default('') }}"
 
 openshift_logging_curator_default_days: 30

roles/openshift_logging/tasks/delete_logging.yaml

@@ -14,6 +14,16 @@
     - templates
     - ds
 
+# return all persistent volume claims as well if purge is set
+- name: delete logging pvc objects
+  oc_obj:
+    state: absent
+    kind: pvc
+    namespace: "{{ openshift_logging_namespace }}"
+    selector: "logging-infra"
+  when:
+    - openshift_logging_purge_logging | default(false) | bool
+
 # delete the oauthclient
 - name: delete oauthclient kibana-proxy
   oc_obj: