From 84ef6e3e686ef49eb1521935bb2f4c1b662cfa34 Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Tue, 19 Jul 2016 08:51:14 -0300 Subject: Skip docker upgrades on Atomic. --- playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'playbooks/common') diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml index 0ea315d0a..59cedc839 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml @@ -84,10 +84,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 + when: docker_upgrade is not defined or docker_upgrade | bool and not openshift.common.is_atomic | bool - include: ../docker/upgrade.yml - when: l_docker_upgrade is defined and l_docker_upgrade | bool + when: l_docker_upgrade is defined and l_docker_upgrade | bool and not openshift.common.is_atomic | bool - include: rpm_upgrade.yml vars: -- cgit v1.2.3