diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-09-09 01:23:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-09 01:23:38 -0400 |
| commit | a1561edf9c116267eb95a8f2a81ee38cfc8e873f (patch) | |
| tree | 12bbbeccc99f84f0f27031cfa5479bcd79de9da4 | |
| parent | 99e68454aa30bf3c80a584447617342a2c4470e2 (diff) | |
| parent | cfa347bb38c8e29b517ef6603ce9f320007bab62 (diff) | |
| download | openshift-a1561edf9c116267eb95a8f2a81ee38cfc8e873f.tar.gz openshift-a1561edf9c116267eb95a8f2a81ee38cfc8e873f.tar.bz2 openshift-a1561edf9c116267eb95a8f2a81ee38cfc8e873f.tar.xz openshift-a1561edf9c116267eb95a8f2a81ee38cfc8e873f.zip | |
Merge pull request #5339 from mtnbikenc/fix-upgrade-path
Merged by openshift-bot
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/pre/tasks/verify_docker_upgrade_targets.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/pre/tasks/verify_docker_upgrade_targets.yml b/playbooks/common/openshift-cluster/upgrades/pre/tasks/verify_docker_upgrade_targets.yml index 9d8b73cff..6d8503879 100644 --- a/playbooks/common/openshift-cluster/upgrades/pre/tasks/verify_docker_upgrade_targets.yml +++ b/playbooks/common/openshift-cluster/upgrades/pre/tasks/verify_docker_upgrade_targets.yml @@ -1,8 +1,10 @@ --- # Only check if docker upgrade is required if docker_upgrade is not # already set to False. -- include: ../docker/upgrade_check.yml - when: docker_upgrade is not defined or docker_upgrade | bool and not openshift.common.is_atomic | bool +- include: ../../docker/upgrade_check.yml + when: + - docker_upgrade is not defined or (docker_upgrade | bool) + - not (openshift.common.is_atomic | bool) # Additional checks for Atomic hosts: |