summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node/tasks
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivano@gnu.org>2017-02-15 10:06:41 +0100
committerGitHub <noreply@github.com>2017-02-15 10:06:41 +0100
commitec7340eb707ca25716b02d06bfb3fc16796aeaca (patch)
tree58689436888a99fec83310d0debee56bdb261ea2 /roles/openshift_node/tasks
parent9ab5683896630267fa26f94c2859727227f49a73 (diff)
parente63ff886e7d52470bfc7d8baab2b24766759c166 (diff)
downloadopenshift-ec7340eb707ca25716b02d06bfb3fc16796aeaca.tar.gz
openshift-ec7340eb707ca25716b02d06bfb3fc16796aeaca.tar.bz2
openshift-ec7340eb707ca25716b02d06bfb3fc16796aeaca.tar.xz
openshift-ec7340eb707ca25716b02d06bfb3fc16796aeaca.zip
Merge pull request #3332 from giuseppe/system-containers-ha
system containers: add support for HA deployments
Diffstat (limited to 'roles/openshift_node/tasks')
-rw-r--r--roles/openshift_node/tasks/node_system_container.yml8
-rw-r--r--roles/openshift_node/tasks/openvswitch_system_container.yml10
2 files changed, 10 insertions, 8 deletions
diff --git a/roles/openshift_node/tasks/node_system_container.yml b/roles/openshift_node/tasks/node_system_container.yml
index 01e2d33c7..3ae5c7600 100644
--- a/roles/openshift_node/tasks/node_system_container.yml
+++ b/roles/openshift_node/tasks/node_system_container.yml
@@ -16,14 +16,16 @@
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
+ - 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) and ("node" in result.stdout) | bool
+ - not l_is_same_version
+ - ("node" in result.stdout)
- name: Install Node system container package
command: >
@@ -31,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
diff --git a/roles/openshift_node/tasks/openvswitch_system_container.yml b/roles/openshift_node/tasks/openvswitch_system_container.yml
index 47fac99eb..6114230d0 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,19 +16,21 @@
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
+ - l_is_same_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
+ - not l_is_same_version
+ - ("openvswitch" in result.stdout) | bool
- name: Install OpenvSwitch system container package
command: >
atomic install --system --name=openvswitch {{ openshift.common.system_images_registry }}/{{ openshift.node.ovs_system_image }}:{{ openshift_image_tag }}
when:
- - (openshift.common.version is not defined) or (openshift.common.version != openshift_version) or ("openvswitch" not in result.stdout) | bool
+ - not l_is_same_version or ("openvswitch" not in result.stdout) | bool
notify:
- restart docker