summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2017-02-10 17:22:19 +0100
committerGiuseppe Scrivano <gscrivan@redhat.com>2017-02-10 17:23:46 +0100
commit9347f8d1f7b34b9362d2807878c963e6baea4896 (patch)
tree7fa2d80a5b1265b3a3b71b6f8fa3ae3493610576
parentb24f4c837241b0d9710b1d8a69850fa323206cd3 (diff)
downloadopenshift-9347f8d1f7b34b9362d2807878c963e6baea4896.tar.gz
openshift-9347f8d1f7b34b9362d2807878c963e6baea4896.tar.bz2
openshift-9347f8d1f7b34b9362d2807878c963e6baea4896.tar.xz
openshift-9347f8d1f7b34b9362d2807878c963e6baea4896.zip
node: simplify when conditionals
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
-rw-r--r--roles/openshift_node/tasks/node_system_container.yml7
1 files changed, 5 insertions, 2 deletions
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: >