From 31dce842e58ff6ccde7d01684d65c54a355ed526 Mon Sep 17 00:00:00 2001 From: Samuel Munilla Date: Wed, 13 Jan 2016 10:22:43 -0500 Subject: v3_0_to_v3_1_upgrade: Install storage packages Include the existing storage plugin configuration during an upgrade. --- playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'playbooks') diff --git a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml index 68df2153d..39b5c80ca 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml @@ -398,6 +398,9 @@ - name: Ensure node service enabled service: name="{{ openshift.common.service_type }}-node" state=started enabled=yes + - name: Additional storage plugin configuration + include: ../../../../../roles/openshift_node/tasks/storage_plugins/main.yml + - set_fact: node_update_complete: True -- cgit v1.2.3 From ce5a1411de5ba7efd88f68404faf45183d81002c Mon Sep 17 00:00:00 2001 From: Samuel Munilla Date: Wed, 13 Jan 2016 13:32:50 -0500 Subject: v3_0_to_v3_1_upgrade: Copy tasks rather than including from the playbook As suggested, this should help decouple the upgrade from the config --- .../upgrades/v3_0_to_v3_1/upgrade.yml | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'playbooks') diff --git a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml index 39b5c80ca..6142c0167 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml @@ -398,8 +398,25 @@ - name: Ensure node service enabled service: name="{{ openshift.common.service_type }}-node" state=started enabled=yes - - name: Additional storage plugin configuration - include: ../../../../../roles/openshift_node/tasks/storage_plugins/main.yml + - name: Install Ceph storage plugin dependencies + action: "{{ ansible_pkg_mgr }} name=ceph-common state=present" + when: not openshift.common.is_atomic | bool + + - name: Install GlusterFS storage plugin dependencies + action: "{{ ansible_pkg_mgr }} name=glusterfs-fuse state=present" + when: not openshift.common.is_atomic | bool + + - name: Set sebooleans to allow gluster storage plugin access from containers + seboolean: + name: "{{ item }}" + state: yes + persistent: yes + when: ansible_selinux and ansible_selinux.status == "enabled" + with_items: + - virt_use_fusefs + - virt_sandbox_use_fusefs + register: sebool_result + failed_when: "'state' not in sebool_result and 'msg' in sebool_result and 'SELinux boolean {{ item }} does not exist' not in sebool_result.msg" - set_fact: node_update_complete: True -- cgit v1.2.3 From 59fc7a8c816c162d8ea80d2c0dac2b960714c770 Mon Sep 17 00:00:00 2001 From: Samuel Munilla Date: Thu, 14 Jan 2016 15:18:23 -0500 Subject: v3_0_to_v3_1_upgrade: Remove is_atomic check for upgrades --- playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml | 2 -- 1 file changed, 2 deletions(-) (limited to 'playbooks') diff --git a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml index 6142c0167..938834ade 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml @@ -400,11 +400,9 @@ - name: Install Ceph storage plugin dependencies action: "{{ ansible_pkg_mgr }} name=ceph-common state=present" - when: not openshift.common.is_atomic | bool - name: Install GlusterFS storage plugin dependencies action: "{{ ansible_pkg_mgr }} name=glusterfs-fuse state=present" - when: not openshift.common.is_atomic | bool - name: Set sebooleans to allow gluster storage plugin access from containers seboolean: -- cgit v1.2.3