diff options
| author | Russell Teague <rteague@redhat.com> | 2017-12-14 15:00:59 -0500 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2017-12-14 16:03:44 -0500 |
| commit | c113074f5b84881f416aca40e2bf4e20d4e6ce41 (patch) | |
| tree | 307af8f0ddfc9bb5986dbcf8f17d2e2303f70386 /roles/container_runtime/tasks/package_docker.yml | |
| parent | 29d3212bf1089661b9fd38db59d72160a39d39d4 (diff) | |
| download | openshift-c113074f5b84881f416aca40e2bf4e20d4e6ce41.tar.gz openshift-c113074f5b84881f416aca40e2bf4e20d4e6ce41.tar.bz2 openshift-c113074f5b84881f416aca40e2bf4e20d4e6ce41.tar.xz openshift-c113074f5b84881f416aca40e2bf4e20d4e6ce41.zip | |
Deprecate using Ansible tests as filters
Diffstat (limited to 'roles/container_runtime/tasks/package_docker.yml')
| -rw-r--r-- | roles/container_runtime/tasks/package_docker.yml | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/roles/container_runtime/tasks/package_docker.yml b/roles/container_runtime/tasks/package_docker.yml index 89899c9cf..d9d4037dd 100644 --- a/roles/container_runtime/tasks/package_docker.yml +++ b/roles/container_runtime/tasks/package_docker.yml @@ -6,7 +6,7 @@ when: not openshift.common.is_atomic | bool register: curr_docker_version retries: 4 - until: curr_docker_version | succeeded + until: curr_docker_version is succeeded changed_when: false # Some basic checks to ensure the role will complete @@ -19,9 +19,12 @@ package: name: "docker{{ '-' + docker_version if docker_version is defined else '' }}" state: present - when: not openshift.common.is_atomic | bool and not curr_docker_version | skipped and not curr_docker_version.stdout != '' + when: + - not (openshift.common.is_atomic | bool) + - not (curr_docker_version is skipped) + - not (curr_docker_version.stdout != '') register: result - until: result | success + until: result is succeeded - block: # Extend the default Docker service unit file when using iptables-services @@ -137,11 +140,11 @@ state: started daemon_reload: yes register: r_docker_package_docker_start_result - until: not r_docker_package_docker_start_result | failed + until: not (r_docker_package_docker_start_result is failed) retries: 3 delay: 30 - set_fact: - docker_service_status_changed: "{{ (r_docker_package_docker_start_result | changed) and (r_docker_already_running_result.stdout != 'ActiveState=active' ) }}" + docker_service_status_changed: "{{ (r_docker_package_docker_start_result is changed) and (r_docker_already_running_result.stdout != 'ActiveState=active' ) }}" - include_tasks: common/post.yml |