diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-02 15:47:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-02 15:47:53 -0700 |
| commit | 2ef3838f922b1cbeacbeb78b27a2bd975eb19560 (patch) | |
| tree | e886a6f3e92ceae52f0e71b5b58e4ec1c63a6f8b /roles | |
| parent | d937aa5981afa9133b1a160329d36b763803f402 (diff) | |
| parent | e99b0d8cc868f245cd499f6383eca0b70ac693c7 (diff) | |
| download | openshift-2ef3838f922b1cbeacbeb78b27a2bd975eb19560.tar.gz openshift-2ef3838f922b1cbeacbeb78b27a2bd975eb19560.tar.bz2 openshift-2ef3838f922b1cbeacbeb78b27a2bd975eb19560.tar.xz openshift-2ef3838f922b1cbeacbeb78b27a2bd975eb19560.zip | |
Merge pull request #5600 from ewolinetz/bz1496352
Automatic merge from submit-queue.
Reverting using uninstall variables for logging and metrics
Reverting using `uninstall` variables for logging and metrics.
Addresses bug and comments in https://bugzilla.redhat.com/show_bug.cgi?id=1496352
Diffstat (limited to 'roles')
| -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 |