diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-09 16:39:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-09 16:39:10 -0400 |
| commit | f555b4c341ff96d3c4f6bd86919c1a47b1193b0e (patch) | |
| tree | 4300cedf15cc9e94c8e35b07199fd7b7a5220276 /roles/openshift_node | |
| parent | 4a87e79b695c08392cebc20135a2e38300863d18 (diff) | |
| parent | af64e08020e94566f27e4f44b48d485b37b236c1 (diff) | |
| download | openshift-f555b4c341ff96d3c4f6bd86919c1a47b1193b0e.tar.gz openshift-f555b4c341ff96d3c4f6bd86919c1a47b1193b0e.tar.bz2 openshift-f555b4c341ff96d3c4f6bd86919c1a47b1193b0e.tar.xz openshift-f555b4c341ff96d3c4f6bd86919c1a47b1193b0e.zip | |
Merge pull request #2268 from abutcher/ansible-2.2
Ansible 2.2 Support
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 16 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/storage_plugins/main.yml | 17 |
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" |