From 4c47f15b8a1328528cd6365b2d05578ab7fc1439 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 10 Feb 2017 15:24:53 +0100 Subject: master: support HA deployments with system containers Signed-off-by: Giuseppe Scrivano --- roles/openshift_master/tasks/system_container.yml | 41 +++++++++++++++++++++++ roles/openshift_master/tasks/systemd_units.yml | 8 +++-- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/roles/openshift_master/tasks/system_container.yml b/roles/openshift_master/tasks/system_container.yml index e3e3d7948..90cbc243d 100644 --- a/roles/openshift_master/tasks/system_container.yml +++ b/roles/openshift_master/tasks/system_container.yml @@ -18,6 +18,7 @@ when: - ("master" in result.stdout) - (openshift.common.version is defined) and (openshift.common.version == openshift_version) | bool + - openshift.master.ha is not defined or not openshift.master.ha | bool - name: Uninstall Master system container package command: > @@ -26,11 +27,51 @@ when: - ("master" in result.stdout) - (openshift.common.version is not defined) or (openshift.common.version != openshift_version) | bool + - openshift.master.ha is not defined or not openshift.master.ha | bool - name: Install Master system container package command: > atomic install --system --name={{ openshift.common.service_type }}-master {{ openshift.common.system_images_registry }}/{{ openshift.master.master_system_image }}:{{ openshift_image_tag }} when: - (openshift.common.version is not defined) or (openshift.common.version != openshift_version) or ("master" not in result.stdout) | bool + - openshift.master.ha is not defined or not openshift.master.ha | bool + notify: + - restart master + +# HA +- name: Update Master HA system container package + command: > + atomic containers update {{ openshift.common.service_type }}-master-{{ item }} + register: update_result + changed_when: "'Extracting' in update_result.stdout" + with_items: + - api + - controllers + when: + - ("master" in result.stdout) + - (openshift.common.version is defined) and (openshift.common.version == openshift_version) | bool + - openshift.master.ha is defined and openshift.master.ha | bool + +- name: Uninstall Master HA system container package + command: > + atomic uninstall {{ openshift.common.service_type }}-master-{{ item }} + failed_when: False + with_items: + - api + - controllers + when: + - ("master" in result.stdout) + - (openshift.common.version is not defined) or (openshift.common.version != openshift_version) | bool + - openshift.master.ha is defined and openshift.master.ha | bool + +- name: Install Master HA system container package + command: > + atomic install --system --set COMMAND={{ item }} --name={{ openshift.common.service_type }}-master-{{ item }} {{ openshift.common.system_images_registry }}/{{ openshift.master.master_system_image }}:{{ openshift_image_tag }} + with_items: + - api + - controllers + when: + - (openshift.common.version is not defined) or (openshift.common.version != openshift_version) or ("master" not in result.stdout) | bool + - openshift.master.ha is defined and openshift.master.ha | bool notify: - restart master diff --git a/roles/openshift_master/tasks/systemd_units.yml b/roles/openshift_master/tasks/systemd_units.yml index 4ab98cbbb..506c8b129 100644 --- a/roles/openshift_master/tasks/systemd_units.yml +++ b/roles/openshift_master/tasks/systemd_units.yml @@ -27,7 +27,9 @@ template: src: "master_docker/master.docker.service.j2" dest: "{{ containerized_svc_dir }}/{{ openshift.common.service_type }}-master.service" - when: openshift.common.is_containerized | bool and (openshift.master.ha is not defined or not openshift.master.ha | bool and not openshift.common.is_master_system_container | bool) + when: + - openshift.common.is_containerized | bool and (openshift.master.ha is not defined or not openshift.master.ha) | bool + - not openshift.common.is_master_system_container | bool register: create_master_unit_file - command: systemctl daemon-reload @@ -37,7 +39,9 @@ template: src: "{{ ha_svc_template_path }}/atomic-openshift-master-{{ item }}.service.j2" dest: "{{ containerized_svc_dir }}/{{ openshift.common.service_type }}-master-{{ item }}.service" - when: openshift.master.ha is defined and openshift.master.ha | bool and openshift_master_cluster_method == "native" + when: + - openshift.master.ha is defined and openshift.master.ha | bool and openshift_master_cluster_method == "native" + - not openshift.common.is_master_system_container | bool with_items: - api - controllers -- cgit v1.2.1 From 07de61d44642e0b06cc0dffc62e29ddf7f678991 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 10 Feb 2017 17:22:44 +0100 Subject: uninstall: delete master-api and master-controllers Signed-off-by: Giuseppe Scrivano --- playbooks/adhoc/uninstall.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml index 147e84131..ffdcd0ce1 100644 --- a/playbooks/adhoc/uninstall.yml +++ b/playbooks/adhoc/uninstall.yml @@ -148,6 +148,22 @@ - vovsbr when: "{{ openshift_remove_all | default(true) | bool }}" + - shell: atomic uninstall "{{ item }}"-master-api + changed_when: False + failed_when: False + with_items: + - openshift-enterprise + - atomic-enterprise + - origin + + - shell: atomic uninstall "{{ item }}"-master-controllers + changed_when: False + failed_when: False + with_items: + - openshift-enterprise + - atomic-enterprise + - origin + - shell: atomic uninstall "{{ item }}"-master changed_when: False failed_when: False -- cgit v1.2.1 From b24f4c837241b0d9710b1d8a69850fa323206cd3 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 10 Feb 2017 17:21:17 +0100 Subject: openvswitch: simplify when conditionals Signed-off-by: Giuseppe Scrivano --- roles/openshift_node/tasks/openvswitch_system_container.yml | 9 +++++---- 1 file 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: > -- cgit v1.2.1 From 9347f8d1f7b34b9362d2807878c963e6baea4896 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 10 Feb 2017 17:22:19 +0100 Subject: node: simplify when conditionals Signed-off-by: Giuseppe Scrivano --- roles/openshift_node/tasks/node_system_container.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/roles/openshift_node/tasks/node_system_container.yml b/roles/openshift_node/tasks/node_system_container.yml index 01e2d33c7..bb1f4a4dd 100644 --- a/roles/openshift_node/tasks/node_system_container.yml +++ b/roles/openshift_node/tasks/node_system_container.yml @@ -16,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 ("node" in result.stdout) | bool + - openshift.common.version is defined + - openshift.common.version == openshift_version + - ("node" in result.stdout) | bool - 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 + - (openshift.common.version is not defined) or (openshift.common.version != openshift_version) + - ("node" in result.stdout) | bool - name: Install Node system container package command: > -- cgit v1.2.1 From 95cf33d8b8e9bfeffbf1cc80bf55fc3c603be190 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Sun, 12 Feb 2017 19:25:15 +0100 Subject: master, vars/main.yml: define l_is_ha and l_is_same_version Signed-off-by: Giuseppe Scrivano --- roles/openshift_master/tasks/system_container.yml | 24 +++++++++++------------ roles/openshift_master/vars/main.yml | 3 +++ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/roles/openshift_master/tasks/system_container.yml b/roles/openshift_master/tasks/system_container.yml index 90cbc243d..a0e1ac75e 100644 --- a/roles/openshift_master/tasks/system_container.yml +++ b/roles/openshift_master/tasks/system_container.yml @@ -17,8 +17,8 @@ changed_when: "'Extracting' in update_result.stdout" when: - ("master" in result.stdout) - - (openshift.common.version is defined) and (openshift.common.version == openshift_version) | bool - - openshift.master.ha is not defined or not openshift.master.ha | bool + - l_is_same_version + - not l_is_ha - name: Uninstall Master system container package command: > @@ -26,15 +26,15 @@ failed_when: False when: - ("master" in result.stdout) - - (openshift.common.version is not defined) or (openshift.common.version != openshift_version) | bool - - openshift.master.ha is not defined or not openshift.master.ha | bool + - not l_is_same_version + - not l_is_ha - name: Install Master system container package command: > atomic install --system --name={{ openshift.common.service_type }}-master {{ openshift.common.system_images_registry }}/{{ openshift.master.master_system_image }}:{{ openshift_image_tag }} when: - - (openshift.common.version is not defined) or (openshift.common.version != openshift_version) or ("master" not in result.stdout) | bool - - openshift.master.ha is not defined or not openshift.master.ha | bool + - not l_is_same_version or ("master" not in result.stdout) | bool + - not l_is_ha notify: - restart master @@ -49,8 +49,8 @@ - controllers when: - ("master" in result.stdout) - - (openshift.common.version is defined) and (openshift.common.version == openshift_version) | bool - - openshift.master.ha is defined and openshift.master.ha | bool + - l_is_same_version + - l_is_ha - name: Uninstall Master HA system container package command: > @@ -61,8 +61,8 @@ - controllers when: - ("master" in result.stdout) - - (openshift.common.version is not defined) or (openshift.common.version != openshift_version) | bool - - openshift.master.ha is defined and openshift.master.ha | bool + - not l_is_same_version + - l_is_ha - name: Install Master HA system container package command: > @@ -71,7 +71,7 @@ - api - controllers when: - - (openshift.common.version is not defined) or (openshift.common.version != openshift_version) or ("master" not in result.stdout) | bool - - openshift.master.ha is defined and openshift.master.ha | bool + - not l_is_same_version or ("master" not in result.stdout) | bool + - l_is_ha notify: - restart master diff --git a/roles/openshift_master/vars/main.yml b/roles/openshift_master/vars/main.yml index 01cd28c66..1e157097d 100644 --- a/roles/openshift_master/vars/main.yml +++ b/roles/openshift_master/vars/main.yml @@ -18,3 +18,6 @@ openshift_master_valid_grant_methods: - auto - prompt - deny + +l_is_ha: "{{ openshift.master.ha is defined and openshift.master.ha | bool }}" +l_is_same_version: "{{ (openshift.common.version is defined) and (openshift.common.version == openshift_version) | bool }}" -- cgit v1.2.1 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 +++++------ roles/openshift_node/tasks/openvswitch_system_container.yml | 7 +++---- roles/openshift_node/vars/main.yml | 2 ++ 3 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 roles/openshift_node/vars/main.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 diff --git a/roles/openshift_node/tasks/openvswitch_system_container.yml b/roles/openshift_node/tasks/openvswitch_system_container.yml index 69d028b92..6114230d0 100644 --- a/roles/openshift_node/tasks/openvswitch_system_container.yml +++ b/roles/openshift_node/tasks/openvswitch_system_container.yml @@ -16,8 +16,7 @@ register: update_result changed_when: "'Extracting' in update_result.stdout" when: - - openshift.common.version is defined - - openshift.common.version == openshift_version + - l_is_same_version - ("openvswitch" in result.stdout) | bool - name: Uninstall OpenvSwitch system container package @@ -25,13 +24,13 @@ atomic uninstall openvswitch failed_when: False when: - - (openshift.common.version is not defined) or (openshift.common.version != openshift_version) + - 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 diff --git a/roles/openshift_node/vars/main.yml b/roles/openshift_node/vars/main.yml new file mode 100644 index 000000000..0c2abf3b9 --- /dev/null +++ b/roles/openshift_node/vars/main.yml @@ -0,0 +1,2 @@ +--- +l_is_same_version: "{{ (openshift.common.version is defined) and (openshift.common.version == openshift_version) | bool }}" -- cgit v1.2.1