summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-01-07 11:35:09 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-01-07 11:35:09 -0500
commitb239a510e182482e947ff49d8ab00180bf410c0e (patch)
treec452d5546220c18ca25d28d75eed196c1cd6b455
parent2d13cea12a01caaea20d4bae874db7ee7beaf22f (diff)
parentedbe2cff2d5c5d2a0df678e690278b4dfd78b29d (diff)
downloadopenshift-b239a510e182482e947ff49d8ab00180bf410c0e.tar.gz
openshift-b239a510e182482e947ff49d8ab00180bf410c0e.tar.bz2
openshift-b239a510e182482e947ff49d8ab00180bf410c0e.tar.xz
openshift-b239a510e182482e947ff49d8ab00180bf410c0e.zip
Merge pull request #1130 from sdodson/bz1296022
Install gluster and ceph packages when containerized but not atomic
-rw-r--r--roles/openshift_node/tasks/storage_plugins/ceph.yml2
-rw-r--r--roles/openshift_node/tasks/storage_plugins/glusterfs.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_node/tasks/storage_plugins/ceph.yml b/roles/openshift_node/tasks/storage_plugins/ceph.yml
index 119ad62ef..eed3c99a3 100644
--- a/roles/openshift_node/tasks/storage_plugins/ceph.yml
+++ b/roles/openshift_node/tasks/storage_plugins/ceph.yml
@@ -1,4 +1,4 @@
---
- name: Install Ceph storage plugin dependencies
action: "{{ ansible_pkg_mgr }} name=ceph-common state=present"
- when: not openshift.common.is_containerized | bool \ No newline at end of file
+ when: not openshift.common.is_atomic | bool \ No newline at end of file
diff --git a/roles/openshift_node/tasks/storage_plugins/glusterfs.yml b/roles/openshift_node/tasks/storage_plugins/glusterfs.yml
index 91ee77e7e..8fc8497fa 100644
--- a/roles/openshift_node/tasks/storage_plugins/glusterfs.yml
+++ b/roles/openshift_node/tasks/storage_plugins/glusterfs.yml
@@ -1,7 +1,7 @@
---
- name: Install GlusterFS storage plugin dependencies
action: "{{ ansible_pkg_mgr }} name=glusterfs-fuse state=present"
- when: not openshift.common.is_containerized | bool
+ when: not openshift.common.is_atomic | bool
- name: Set sebooleans to allow gluster storage plugin access from containers
seboolean: