C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2613 from riverzhang/atomic-docker

Browse source 
Fix check docker error for atomic
This commit is contained in:
Rong Zhang 2018-04-08 20:58:42 +08:00 committed by GitHub
commit 7b8359df4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
roles/docker/tasks/pre-upgrade.yml
View file

@ -6,7 +6,9 @@
with_items: with_items:
- docker - docker
- docker-engine - docker-engine
when: ansible_os_family == 'Debian' and (docker_versioned_pkg[docker_version | string] | search('docker-ce')) when:
- ansible_os_family == 'Debian'
- (docker_versioned_pkg[docker_version | string] | search('docker-ce'))
- name: Ensure old versions of Docker are not installed. | RedHat - name: Ensure old versions of Docker are not installed. | RedHat
package: package:
@ -17,4 +19,7 @@
- docker-common - docker-common
- docker-engine - docker-engine
- docker-selinux - docker-selinux
when: ansible_os_family == 'RedHat' and (docker_versioned_pkg[docker_version | string] | search('docker-ce')) when:
- ansible_os_family == 'RedHat'
- (docker_versioned_pkg[docker_version | string] | search('docker-ce'))
- not is_atomic