diff options
| author | Eric Wolinetz <ewolinet@redhat.com> | 2017-09-29 11:40:16 -0500 |
|---|---|---|
| committer | Eric Wolinetz <ewolinet@redhat.com> | 2017-09-29 11:40:16 -0500 |
| commit | e99b0d8cc868f245cd499f6383eca0b70ac693c7 (patch) | |
| tree | 76ac817f0dbe82ba7ffda29cbe883b73160a9cb7 | |
| parent | 9920ea81d7f036432553921b708cf8c49ac6ea62 (diff) | |
| download | openshift-e99b0d8cc868f245cd499f6383eca0b70ac693c7.tar.gz openshift-e99b0d8cc868f245cd499f6383eca0b70ac693c7.tar.bz2 openshift-e99b0d8cc868f245cd499f6383eca0b70ac693c7.tar.xz openshift-e99b0d8cc868f245cd499f6383eca0b70ac693c7.zip | |
Reverting using uninstall variables for logging and metrics
| -rw-r--r-- | roles/openshift_logging/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_logging/tasks/main.yaml | 2 | ||||
| -rw-r--r-- | roles/openshift_metrics/defaults/main.yaml | 1 | ||||
| -rw-r--r-- | roles/openshift_metrics/tasks/main.yaml | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml index 5574a1446..0f1f659c6 100644 --- a/roles/openshift_logging/defaults/main.yml +++ b/roles/openshift_logging/defaults/main.yml @@ -8,7 +8,6 @@ openshift_logging_labels: {} openshift_logging_label_key: "" openshift_logging_label_value: "" openshift_logging_install_logging: False -openshift_logging_uninstall_logging: False openshift_logging_purge_logging: False openshift_logging_image_pull_secret: "" diff --git a/roles/openshift_logging/tasks/main.yaml b/roles/openshift_logging/tasks/main.yaml index 0da9771c7..15f6a23e6 100644 --- a/roles/openshift_logging/tasks/main.yaml +++ b/roles/openshift_logging/tasks/main.yaml @@ -36,7 +36,7 @@ - include: delete_logging.yaml when: - - openshift_logging_uninstall_logging | default(false) | bool + - not openshift_logging_install_logging | default(false) | bool - name: Cleaning up local temp dir local_action: file path="{{local_tmp.stdout}}" state=absent diff --git a/roles/openshift_metrics/defaults/main.yaml b/roles/openshift_metrics/defaults/main.yaml index 084b734ee..8da74430f 100644 --- a/roles/openshift_metrics/defaults/main.yaml +++ b/roles/openshift_metrics/defaults/main.yaml @@ -1,7 +1,6 @@ --- openshift_metrics_start_cluster: True openshift_metrics_install_metrics: False -openshift_metrics_uninstall_metrics: False openshift_metrics_startup_timeout: 500 openshift_metrics_hawkular_replicas: 1 diff --git a/roles/openshift_metrics/tasks/main.yaml b/roles/openshift_metrics/tasks/main.yaml index c92458c50..10509fc1e 100644 --- a/roles/openshift_metrics/tasks/main.yaml +++ b/roles/openshift_metrics/tasks/main.yaml @@ -49,7 +49,7 @@ - include: uninstall_metrics.yaml when: - - openshift_metrics_uninstall_metrics | bool + - not openshift_metrics_install_metrics | bool - include: uninstall_hosa.yaml when: not openshift_metrics_install_hawkular_agent | bool |