2 files changed, 14 insertions, 19 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index 889541e25..9c71af6d9 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -106,8 +106,20 @@
   notify:
   - restart node
 
-- name: Additional storage plugin configuration
-  include: storage_plugins/main.yml
+- name: NFS storage plugin configuration
+  include: storage_plugins/nfs.yml
+
+- name: GlusterFS storage plugin configuration
+  include: storage_plugins/glusterfs.yml
+  when: "'glusterfs' in openshift.node.storage_plugin_deps"
+
+- name: Ceph storage plugin configuration
+  include: storage_plugins/ceph.yml
+  when: "'ceph' in openshift.node.storage_plugin_deps"
+
+- name: iSCSI storage plugin configuration
+  include: storage_plugins/iscsi.yml
+  when: "'iscsi' in openshift.node.storage_plugin_deps"
 
 # Necessary because when you're on a node that's also a master the master will be
 # restarted after the node restarts docker and it will take up to 60 seconds for
diff --git a/roles/openshift_node/tasks/storage_plugins/main.yml b/roles/openshift_node/tasks/storage_plugins/main.yml
deleted file mode 100644
index fe638718d..000000000
--- a/roles/openshift_node/tasks/storage_plugins/main.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# The NFS storage plugin is always enabled since it doesn't require any
-# additional package dependencies
-- name: NFS storage plugin configuration
-  include: nfs.yml
-
-- name: GlusterFS storage plugin configuration
-  include: glusterfs.yml
-  when: "'glusterfs' in openshift.node.storage_plugin_deps"
-
-- name: Ceph storage plugin configuration
-  include: ceph.yml
-  when: "'ceph' in openshift.node.storage_plugin_deps"
-
-- name: iSCSI storage plugin configuration
-  include: iscsi.yml
-  when: "'iscsi' in openshift.node.storage_plugin_deps"