diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-08-31 07:55:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-31 07:55:05 -0400 |
| commit | 4436451212ce5d5cc43fcafee13ea7e344997f27 (patch) | |
| tree | 457e3d9b9b74b6dd2b9705f4c8f222216316bb61 /roles | |
| parent | d57f27bf71f68ba91996bc4a0b1e79b3be956b7e (diff) | |
| parent | 51a2d9dbadea02f22168629d44ff339b3c45d6d1 (diff) | |
| download | openshift-4436451212ce5d5cc43fcafee13ea7e344997f27.tar.gz openshift-4436451212ce5d5cc43fcafee13ea7e344997f27.tar.bz2 openshift-4436451212ce5d5cc43fcafee13ea7e344997f27.tar.xz openshift-4436451212ce5d5cc43fcafee13ea7e344997f27.zip | |
Merge pull request #5189 from wozniakjan/logging_purge_uninstall
Merged by openshift-bot
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_logging/README.md | 5 | ||||
| -rw-r--r-- | roles/openshift_logging/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_logging/tasks/delete_logging.yaml | 10 |
3 files changed, 13 insertions, 3 deletions
diff --git a/roles/openshift_logging/README.md b/roles/openshift_logging/README.md index 70aef02cd..f283261c4 100644 --- a/roles/openshift_logging/README.md +++ b/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`. diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml index f07d7e6da..716f0e002 100644 --- a/roles/openshift_logging/defaults/main.yml +++ b/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 diff --git a/roles/openshift_logging/tasks/delete_logging.yaml b/roles/openshift_logging/tasks/delete_logging.yaml index 6d023a02d..45298e345 100644 --- a/roles/openshift_logging/tasks/delete_logging.yaml +++ b/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: |