summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-08-04 15:00:46 -0400
committerAndrew Butcher <abutcher@redhat.com>2016-08-08 15:31:29 -0400
commitaf64e08020e94566f27e4f44b48d485b37b236c1 (patch)
tree56bab471e4f496f1d7498d64d287a8633b2ebe7a
parent6d34ffd8e302028fab9316fe45aa537dc6434e5c (diff)
downloadopenshift-af64e08020e94566f27e4f44b48d485b37b236c1.tar.gz
openshift-af64e08020e94566f27e4f44b48d485b37b236c1.tar.bz2
openshift-af64e08020e94566f27e4f44b48d485b37b236c1.tar.xz
openshift-af64e08020e94566f27e4f44b48d485b37b236c1.zip
Move storage includes up to main.
-rw-r--r--roles/openshift_hosted/tasks/registry/registry.yml2
-rw-r--r--roles/openshift_node/tasks/main.yml16
-rw-r--r--roles/openshift_node/tasks/storage_plugins/main.yml17
3 files changed, 16 insertions, 19 deletions
diff --git a/roles/openshift_hosted/tasks/registry/registry.yml b/roles/openshift_hosted/tasks/registry/registry.yml
index fc037ceda..b28974236 100644
--- a/roles/openshift_hosted/tasks/registry/registry.yml
+++ b/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']
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"