summaryrefslogtreecommitdiffstats
path: root/playbooks/adhoc
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-12-15 13:56:28 -0500
committerGitHub <noreply@github.com>2017-12-15 13:56:28 -0500
commitd96898b3138c4d85ba8e2d8fd34734029697777c (patch)
tree573fdd49e86e3fc68fe47bae84ddfa50ccdaa6f1 /playbooks/adhoc
parente5a4fecbc35cbede7eb2fb23ed42ba8a2f06c3b3 (diff)
parentc113074f5b84881f416aca40e2bf4e20d4e6ce41 (diff)
downloadopenshift-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 'playbooks/adhoc')
-rw-r--r--playbooks/adhoc/uninstall.yml14
1 files changed, 7 insertions, 7 deletions
diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml
index 9f044c089..584117e6b 100644
--- a/playbooks/adhoc/uninstall.yml
+++ b/playbooks/adhoc/uninstall.yml
@@ -126,13 +126,13 @@
- tuned-profiles-atomic-openshift-node
- tuned-profiles-origin-node
register: result
- until: result | success
+ until: result is succeeded
- name: Remove flannel package
package: name=flannel state=absent
when: openshift_use_flannel | default(false) | bool
register: result
- until: result | success
+ until: result is succeeded
when: not is_atomic | bool
- shell: systemctl reset-failed
@@ -286,9 +286,9 @@
- name: restart docker
service: name=docker state=stopped enabled=no
failed_when: false
- when: not (container_engine | changed)
+ when: not (container_engine is changed)
register: l_docker_restart_docker_in_pb_result
- until: not l_docker_restart_docker_in_pb_result | failed
+ until: not (l_docker_restart_docker_in_pb_result is failed)
retries: 3
delay: 30
@@ -384,7 +384,7 @@
- origin-docker-excluder
- origin-master
register: result
- until: result | success
+ until: result is succeeded
- shell: systemctl reset-failed
changed_when: False
@@ -499,7 +499,7 @@
- etcd
- etcd3
register: result
- until: result | success
+ until: result is succeeded
- shell: systemctl reset-failed
changed_when: False
@@ -558,7 +558,7 @@
with_items:
- haproxy
register: result
- until: result | success
+ until: result is succeeded
- shell: systemctl reset-failed
changed_when: False