diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-02-10 17:21:17 +0100 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-02-10 17:23:46 +0100 |
| commit | b24f4c837241b0d9710b1d8a69850fa323206cd3 (patch) | |
| tree | 4be83fb57d5acb60aa61b207199d6e818de786f7 /roles | |
| parent | 07de61d44642e0b06cc0dffc62e29ddf7f678991 (diff) | |
| download | openshift-b24f4c837241b0d9710b1d8a69850fa323206cd3.tar.gz openshift-b24f4c837241b0d9710b1d8a69850fa323206cd3.tar.bz2 openshift-b24f4c837241b0d9710b1d8a69850fa323206cd3.tar.xz openshift-b24f4c837241b0d9710b1d8a69850fa323206cd3.zip | |
openvswitch: simplify when conditionals
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_node/tasks/openvswitch_system_container.yml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/roles/openshift_node/tasks/openvswitch_system_container.yml b/roles/openshift_node/tasks/openvswitch_system_container.yml index 47fac99eb..69d028b92 100644 --- a/roles/openshift_node/tasks/openvswitch_system_container.yml +++ b/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: > |