diff options
author | Michael Gugino <mgugino@redhat.com> | 2017-12-18 16:13:36 -0500 |
---|---|---|
committer | Michael Gugino <mgugino@redhat.com> | 2017-12-20 10:13:51 -0500 |
commit | e6c159afb4ba39a7266c750d43d6a5e911cc8f21 (patch) | |
tree | 99cb6240e59a7118b2b4c9be603efc7eaeaf4679 /playbooks/common/openshift-cluster/upgrades/pre | |
parent | a5de165b8e7113631a30ef0e4a20b5f74db073f0 (diff) | |
download | openshift-e6c159afb4ba39a7266c750d43d6a5e911cc8f21.tar.gz openshift-e6c159afb4ba39a7266c750d43d6a5e911cc8f21.tar.bz2 openshift-e6c159afb4ba39a7266c750d43d6a5e911cc8f21.tar.xz openshift-e6c159afb4ba39a7266c750d43d6a5e911cc8f21.zip |
Remove openshift.common.{is_atomic|is_containerized}
We set these variables using facts in init, no need
to duplicate the logic all around the codebase.
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/pre')
-rw-r--r-- | playbooks/common/openshift-cluster/upgrades/pre/verify_cluster.yml | 2 | ||||
-rw-r--r-- | playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/pre/verify_cluster.yml b/playbooks/common/openshift-cluster/upgrades/pre/verify_cluster.yml index 3fc18c9b7..4713f8633 100644 --- a/playbooks/common/openshift-cluster/upgrades/pre/verify_cluster.yml +++ b/playbooks/common/openshift-cluster/upgrades/pre/verify_cluster.yml @@ -71,7 +71,7 @@ local_facts: ha: "{{ groups.oo_masters_to_config | length > 1 }}" - - when: openshift.common.is_containerized | bool + - when: openshift_is_containerized | bool block: - set_fact: master_services: diff --git a/playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml b/playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml index 065a9a8ab..95c37c38c 100644 --- a/playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml +++ b/playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml @@ -15,9 +15,9 @@ docker pull {{ openshift_cli_image }}:{{ openshift_image_tag }} register: pull_result changed_when: "'Downloaded newer image' in pull_result.stdout" - when: openshift.common.is_containerized | bool + when: openshift_is_containerized | bool -- when: not openshift.common.is_containerized | bool +- when: not openshift_is_containerized | bool block: - name: Check latest available OpenShift RPM version repoquery: |