From 9347f8d1f7b34b9362d2807878c963e6baea4896 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 10 Feb 2017 17:22:19 +0100 Subject: node: simplify when conditionals Signed-off-by: Giuseppe Scrivano --- roles/openshift_node/tasks/node_system_container.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'roles/openshift_node/tasks/node_system_container.yml') diff --git a/roles/openshift_node/tasks/node_system_container.yml b/roles/openshift_node/tasks/node_system_container.yml index 01e2d33c7..bb1f4a4dd 100644 --- a/roles/openshift_node/tasks/node_system_container.yml +++ b/roles/openshift_node/tasks/node_system_container.yml @@ -16,14 +16,17 @@ register: update_result changed_when: "'Extracting' in update_result.stdout" when: - - (openshift.common.version is defined) and (openshift.common.version == openshift_version) and ("node" in result.stdout) | bool + - openshift.common.version is defined + - openshift.common.version == openshift_version + - ("node" in result.stdout) | bool - name: Uninstall Node system container package command: > atomic uninstall {{ openshift.common.service_type }}-node failed_when: False when: - - (openshift.common.version is not defined) or (openshift.common.version != openshift_version) and ("node" in result.stdout) | bool + - (openshift.common.version is not defined) or (openshift.common.version != openshift_version) + - ("node" in result.stdout) | bool - name: Install Node system container package command: > -- cgit v1.2.1