diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-10-14 09:17:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-14 09:17:36 -0400 |
| commit | 845eed3081b5fd6a3ca0f6b8ede0acaee19f6049 (patch) | |
| tree | 3808bbfda8ea9b8e9b3ba33543fc005e0fdc93d3 /playbooks/common | |
| parent | 7d6f9f7851450de992f183666ffbf8751ce14ce0 (diff) | |
| parent | 7d884f4f428ba9659a4b212c913ebf5ee0d97e2d (diff) | |
| download | openshift-845eed3081b5fd6a3ca0f6b8ede0acaee19f6049.tar.gz openshift-845eed3081b5fd6a3ca0f6b8ede0acaee19f6049.tar.bz2 openshift-845eed3081b5fd6a3ca0f6b8ede0acaee19f6049.tar.xz openshift-845eed3081b5fd6a3ca0f6b8ede0acaee19f6049.zip | |
Merge pull request #2603 from dgoodwin/skip-docker-avail-check
upgrade: Don't check avail docker version if not already installed.
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/docker/upgrade_check.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/docker/upgrade_check.yml b/playbooks/common/openshift-cluster/upgrades/docker/upgrade_check.yml index fc26d029e..46ff421fd 100644 --- a/playbooks/common/openshift-cluster/upgrades/docker/upgrade_check.yml +++ b/playbooks/common/openshift-cluster/upgrades/docker/upgrade_check.yml @@ -22,13 +22,15 @@ command: > {{ repoquery_cmd }} --qf '%{version}' "docker" register: avail_docker_version + # Don't expect docker rpm to be available on hosts that don't already have it installed: + when: pkg_check.rc == 0 failed_when: false changed_when: false - fail: msg: This playbook requires access to Docker 1.10 or later # Disable the 1.10 requirement if the user set a specific Docker version - when: docker_version is not defined and (docker_upgrade is not defined or docker_upgrade | bool == True) and (avail_docker_version.stdout == "" or avail_docker_version.stdout | version_compare('1.10','<')) + when: docker_version is not defined and (docker_upgrade is not defined or docker_upgrade | bool == True) and (pkg_check.rc == 0 and (avail_docker_version.stdout == "" or avail_docker_version.stdout | version_compare('1.10','<'))) # Default l_docker_upgrade to False, we'll set to True if an upgrade is required: - set_fact: @@ -37,7 +39,7 @@ # Make sure a docker_verison is set if none was requested: - set_fact: docker_version: "{{ avail_docker_version.stdout }}" - when: docker_version is not defined + when: pkg_check.rc == 0 and docker_version is not defined - name: Flag for Docker upgrade if necessary set_fact: |