浏览代码

node: simplify when conditionals

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Giuseppe Scrivano 8 年之前
父节点
当前提交
9347f8d1f7
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5 2
      roles/openshift_node/tasks/node_system_container.yml

+ 5 - 2
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: >