diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-19 10:30:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-19 10:30:29 -0400 |
| commit | 3b9c6afe1684c0c9be6dd1c3a12c493c85c38751 (patch) | |
| tree | 4c76a70ef2f716675ab3fbcfcc8be7778e3ba258 /playbooks/common/openshift-cluster | |
| parent | a66b5026a4aff70fe38bb369d7cba0f7372725ef (diff) | |
| parent | 84ef6e3e686ef49eb1521935bb2f4c1b662cfa34 (diff) | |
| download | openshift-3b9c6afe1684c0c9be6dd1c3a12c493c85c38751.tar.gz openshift-3b9c6afe1684c0c9be6dd1c3a12c493c85c38751.tar.bz2 openshift-3b9c6afe1684c0c9be6dd1c3a12c493c85c38751.tar.xz openshift-3b9c6afe1684c0c9be6dd1c3a12c493c85c38751.zip | |
Merge pull request #2174 from dgoodwin/skip-docker-upgrade-atomic
Skip docker upgrades on Atomic.
Diffstat (limited to 'playbooks/common/openshift-cluster')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml | 4 |
1 files changed, 2 insertions, 2 deletions
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: |