summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-01-06 13:03:29 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-01-06 13:03:29 -0500
commitaf803894ad2e214948264d105f539bb7514e92ce (patch)
tree5648595c9337704dba638657670458c88bd2a466 /roles
parent1841c856a3f35c4ecf34c9fa6d7dce2cbeb411ce (diff)
parent5b0543bda842f022289cae88a02498fa90d6a9a1 (diff)
downloadopenshift-af803894ad2e214948264d105f539bb7514e92ce.tar.gz
openshift-af803894ad2e214948264d105f539bb7514e92ce.tar.bz2
openshift-af803894ad2e214948264d105f539bb7514e92ce.tar.xz
openshift-af803894ad2e214948264d105f539bb7514e92ce.zip
Merge pull request #1124 from abutcher/container-virt_use_nfs
Remove not is_containerized restriction on storage plugin includes.
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_node/tasks/storage_plugins/main.yml5
1 files changed, 2 insertions, 3 deletions
diff --git a/roles/openshift_node/tasks/storage_plugins/main.yml b/roles/openshift_node/tasks/storage_plugins/main.yml
index d237c26ec..39c7b9390 100644
--- a/roles/openshift_node/tasks/storage_plugins/main.yml
+++ b/roles/openshift_node/tasks/storage_plugins/main.yml
@@ -3,12 +3,11 @@
# additional package dependencies
- name: NFS storage plugin configuration
include: nfs.yml
- when: not openshift.common.is_containerized | bool
- name: GlusterFS storage plugin configuration
include: glusterfs.yml
- when: "'glusterfs' in openshift.node.storage_plugin_deps and not openshift.common.is_containerized | bool "
+ when: "'glusterfs' in openshift.node.storage_plugin_deps"
- name: Ceph storage plugin configuration
include: ceph.yml
- when: "'ceph' in openshift.node.storage_plugin_deps and not openshift.common.is_containerized | bool"
+ when: "'ceph' in openshift.node.storage_plugin_deps"