From b24f4c837241b0d9710b1d8a69850fa323206cd3 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Fri, 10 Feb 2017 17:21:17 +0100
Subject: openvswitch: simplify when conditionals
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
roles/openshift_node/tasks/openvswitch_system_container.yml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
(limited to 'roles/openshift_node/tasks')
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: >
--
cgit v1.2.3