diff options
author | Russell Teague <rteague@redhat.com> | 2017-12-15 13:56:28 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-15 13:56:28 -0500 |
commit | d96898b3138c4d85ba8e2d8fd34734029697777c (patch) | |
tree | 573fdd49e86e3fc68fe47bae84ddfa50ccdaa6f1 /roles/container_runtime/tasks/package_docker.yml | |
parent | e5a4fecbc35cbede7eb2fb23ed42ba8a2f06c3b3 (diff) | |
parent | c113074f5b84881f416aca40e2bf4e20d4e6ce41 (diff) | |
download | openshift-d96898b3138c4d85ba8e2d8fd34734029697777c.tar.gz openshift-d96898b3138c4d85ba8e2d8fd34734029697777c.tar.bz2 openshift-d96898b3138c4d85ba8e2d8fd34734029697777c.tar.xz openshift-d96898b3138c4d85ba8e2d8fd34734029697777c.zip |
Merge pull request #6484 from mtnbikenc/tests-as-filters
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 |