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/flannel | |
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/flannel')
-rw-r--r-- | roles/flannel/handlers/main.yml | 4 | ||||
-rw-r--r-- | roles/flannel/tasks/main.yml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/flannel/handlers/main.yml b/roles/flannel/handlers/main.yml index 705d39f9a..7d79bd3d4 100644 --- a/roles/flannel/handlers/main.yml +++ b/roles/flannel/handlers/main.yml @@ -9,7 +9,7 @@ name: "{{ openshift_docker_service_name }}" state: restarted register: l_docker_restart_docker_in_flannel_result - until: not l_docker_restart_docker_in_flannel_result | failed + until: not (l_docker_restart_docker_in_flannel_result is failed) retries: 3 delay: 30 @@ -18,6 +18,6 @@ name: "{{ openshift_service_type }}-node" state: restarted register: l_restart_node_result - until: not l_restart_node_result | failed + until: not (l_restart_node_result is failed) retries: 3 delay: 30 diff --git a/roles/flannel/tasks/main.yml b/roles/flannel/tasks/main.yml index befe1b2e6..9b9250f31 100644 --- a/roles/flannel/tasks/main.yml +++ b/roles/flannel/tasks/main.yml @@ -4,7 +4,7 @@ package: name=flannel state=present when: not openshift.common.is_atomic | bool register: result - until: result | success + until: result is succeeded - name: Set flannel etcd options become: yes |