From 66b61866cdc7fbe7bde19bf260a361414953f19d Mon Sep 17 00:00:00 2001
From: rongzhang <rongzhang@alauda.io>
Date: Fri, 6 Apr 2018 18:16:05 +0800
Subject: [PATCH] Fix check docker error for atomic

Fix issues #2611
---
 roles/docker/tasks/pre-upgrade.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/roles/docker/tasks/pre-upgrade.yml b/roles/docker/tasks/pre-upgrade.yml
index 9315da305..8b75cba0d 100644
--- a/roles/docker/tasks/pre-upgrade.yml
+++ b/roles/docker/tasks/pre-upgrade.yml
@@ -6,7 +6,9 @@
   with_items:
     - docker
     - 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
   package:
@@ -17,4 +19,7 @@
     - docker-common
     - docker-engine
     - docker-selinux
-  when: ansible_os_family == 'RedHat' and (docker_versioned_pkg[docker_version | string] | search('docker-ce'))
\ No newline at end of file
+  when:
+    - ansible_os_family == 'RedHat'
+    - (docker_versioned_pkg[docker_version | string] | search('docker-ce'))
+    - not is_atomic