Browse Source

openvswitch: simplify when conditionals

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Giuseppe Scrivano 8 years ago
parent
commit
b24f4c8372
1 changed files with 5 additions and 4 deletions
  1. 5 4
      roles/openshift_node/tasks/openvswitch_system_container.yml

+ 5 - 4
roles/openshift_node/tasks/openvswitch_system_container.yml

@@ -9,8 +9,6 @@
   command: >
     atomic containers list --no-trunc -a -f container=openvswitch
   register: result
-  when:
-  - openshift.common.is_openvswitch_system_container | bool
 
 - name: Update OpenvSwitch system container package
   command: >
@@ -18,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 ("openvswitch" in result.stdout) | bool
+  - openshift.common.version is defined
+  - openshift.common.version == openshift_version
+  - ("openvswitch" in result.stdout) | bool
 
 - name: Uninstall OpenvSwitch system container package
   command: >
     atomic uninstall openvswitch
   failed_when: False
   when:
-  - (openshift.common.version is not defined) or (openshift.common.version != openshift_version) and ("openvswitch" in result.stdout) | bool
+  - (openshift.common.version is not defined) or (openshift.common.version != openshift_version)
+  - ("openvswitch" in result.stdout) | bool
 
 - name: Install OpenvSwitch system container package
   command: >