summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-09-08 15:14:03 -0400
committerRussell Teague <rteague@redhat.com>2017-09-08 15:14:03 -0400
commitcfa347bb38c8e29b517ef6603ce9f320007bab62 (patch)
treef22bf1273613a125038f47423da62089517a48d8
parentfaed701d8fd50e7ce6540fd59c2f15fea82de0f6 (diff)
downloadopenshift-cfa347bb38c8e29b517ef6603ce9f320007bab62.tar.gz
openshift-cfa347bb38c8e29b517ef6603ce9f320007bab62.tar.bz2
openshift-cfa347bb38c8e29b517ef6603ce9f320007bab62.tar.xz
openshift-cfa347bb38c8e29b517ef6603ce9f320007bab62.zip
Fix include path for docker upgrade tasks
-rw-r--r--playbooks/common/openshift-cluster/upgrades/pre/tasks/verify_docker_upgrade_targets.yml6
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: