summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Munilla <smunilla@redhat.com>2016-01-13 13:32:50 -0500
committerSamuel Munilla <smunilla@redhat.com>2016-01-13 13:32:50 -0500
commitce5a1411de5ba7efd88f68404faf45183d81002c (patch)
tree933af022cb27de442fe3dfebbfc8ea3a061a993b
parent31dce842e58ff6ccde7d01684d65c54a355ed526 (diff)
downloadopenshift-ce5a1411de5ba7efd88f68404faf45183d81002c.tar.gz
openshift-ce5a1411de5ba7efd88f68404faf45183d81002c.tar.bz2
openshift-ce5a1411de5ba7efd88f68404faf45183d81002c.tar.xz
openshift-ce5a1411de5ba7efd88f68404faf45183d81002c.zip
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
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml21
1 files changed, 19 insertions, 2 deletions
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