Browse Source

Merge pull request #5339 from mtnbikenc/fix-upgrade-path

Merged by openshift-bot
OpenShift Bot 7 years ago
parent
commit
a1561edf9c

+ 4 - 2
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: