diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-13 08:10:12 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-13 08:10:12 -0800 |
| commit | e2fad4e69710c9d4fd18febd4ab60b0f12b78ef8 (patch) | |
| tree | d16f4f4842bffabe5a6fc8fdcaa30fb5ac46c9a9 /roles/container_runtime/defaults | |
| parent | a53d6181a69df2bea769de59e9e54d9c18d8be94 (diff) | |
| parent | deaf085cdb902e5b5404280c84b96511e83b20ac (diff) | |
| download | openshift-e2fad4e69710c9d4fd18febd4ab60b0f12b78ef8.tar.gz openshift-e2fad4e69710c9d4fd18febd4ab60b0f12b78ef8.tar.bz2 openshift-e2fad4e69710c9d4fd18febd4ab60b0f12b78ef8.tar.xz openshift-e2fad4e69710c9d4fd18febd4ab60b0f12b78ef8.zip | |
Merge pull request #7116 from mgugino-upstream-stage/fix-docker-upgrade
Automatic merge from submit-queue.
Fix docker_upgrade variable
Currently, docker_upgrade is ignored during
cluster upgrades.
This commit ensures that the variable is respected.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1543714
Diffstat (limited to 'roles/container_runtime/defaults')
| -rw-r--r-- | roles/container_runtime/defaults/main.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/container_runtime/defaults/main.yml b/roles/container_runtime/defaults/main.yml index 01540776f..77cf86b0a 100644 --- a/roles/container_runtime/defaults/main.yml +++ b/roles/container_runtime/defaults/main.yml @@ -87,6 +87,8 @@ openshift_use_crio_only: False l_openshift_image_tag_default: "{{ openshift_release | default('latest') }}" l_openshift_image_tag: "{{ openshift_image_tag | default(l_openshift_image_tag_default) | string}}" +l_required_docker_version: '1.12' + # --------------------- # # systemcontainers_crio # # --------------------- # |