Move storage includes up to main.

roles/openshift_hosted/tasks/registry/registry.yml

@@ -50,7 +50,9 @@
   when: replicas | int > 0
 
 - include: storage/object_storage.yml
+  static: no
   when: replicas | int > 0 and openshift.hosted.registry.storage.kind | default(none) == 'object'
 
 - include: storage/persistent_volume.yml
+  static: no
   when: replicas | int > 0 and openshift.hosted.registry.storage.kind | default(none) in ['nfs', 'openstack']

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

roles/openshift_node/tasks/storage_plugins/main.yml

@@ -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"