From e63ff886e7d52470bfc7d8baab2b24766759c166 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Sun, 12 Feb 2017 19:34:45 +0100 Subject: node, vars/main.yml: define l_is_ha and l_is_same_version Signed-off-by: Giuseppe Scrivano --- roles/openshift_node/tasks/node_system_container.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'roles/openshift_node/tasks/node_system_container.yml') diff --git a/roles/openshift_node/tasks/node_system_container.yml b/roles/openshift_node/tasks/node_system_container.yml index bb1f4a4dd..3ae5c7600 100644 --- a/roles/openshift_node/tasks/node_system_container.yml +++ b/roles/openshift_node/tasks/node_system_container.yml @@ -16,17 +16,16 @@ register: update_result changed_when: "'Extracting' in update_result.stdout" when: - - openshift.common.version is defined - - openshift.common.version == openshift_version - - ("node" in result.stdout) | bool + - l_is_same_version + - ("node" in result.stdout) - 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) - - ("node" in result.stdout) | bool + - not l_is_same_version + - ("node" in result.stdout) - name: Install Node system container package command: > @@ -34,4 +33,4 @@ register: install_node_result changed_when: "'Extracting' in pull_result.stdout" when: - - (openshift.common.version is not defined) or (openshift.common.version != openshift_version) or ("node" not in result.stdout) | bool + - not l_is_same_version or ("node" not in result.stdout) | bool -- cgit v1.2.1