From 0dd276d51c5738533f993c44b39db8a7f2f43dfc Mon Sep 17 00:00:00 2001
From: Robert van Veelen <rvanveelen@tremorvideo.com>
Date: Wed, 10 Feb 2016 14:22:22 +0000
Subject: add iscsi storage_plugin dependency
---
roles/openshift_node/tasks/storage_plugins/iscsi.yml | 4 ++++
roles/openshift_node/tasks/storage_plugins/main.yml | 4 ++++
2 files changed, 8 insertions(+)
create mode 100644 roles/openshift_node/tasks/storage_plugins/iscsi.yml
(limited to 'roles')
diff --git a/roles/openshift_node/tasks/storage_plugins/iscsi.yml b/roles/openshift_node/tasks/storage_plugins/iscsi.yml
new file mode 100644
index 000000000..d6684b34a
--- /dev/null
+++ b/roles/openshift_node/tasks/storage_plugins/iscsi.yml
@@ -0,0 +1,4 @@
+---
+- name: Install iSCSI storage plugin dependencies
+ action: "{{ ansible_pkg_mgr }} name=iscsi-initiator-utils state=present"
+ when: not openshift.common.is_atomic | bool
diff --git a/roles/openshift_node/tasks/storage_plugins/main.yml b/roles/openshift_node/tasks/storage_plugins/main.yml
index 39c7b9390..fe638718d 100644
--- a/roles/openshift_node/tasks/storage_plugins/main.yml
+++ b/roles/openshift_node/tasks/storage_plugins/main.yml
@@ -11,3 +11,7 @@
- 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"
--
cgit v1.2.3
From 491890380ff509f10d9e2635641874d681eca772 Mon Sep 17 00:00:00 2001
From: Robert van Veelen <rvanveelen@tremorvideo.com>
Date: Wed, 10 Feb 2016 15:47:34 +0000
Subject: update defaults and examples w/ iscsi plugin
---
roles/openshift_facts/library/openshift_facts.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'roles')
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index d11af307b..71397275a 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -712,7 +712,7 @@ def set_deployment_facts_if_unset(facts):
deployment_type = facts['common']['deployment_type']
if 'storage_plugin_deps' not in facts['node']:
if deployment_type in ['openshift-enterprise', 'atomic-enterprise']:
- facts['node']['storage_plugin_deps'] = ['ceph', 'glusterfs']
+ facts['node']['storage_plugin_deps'] = ['ceph', 'glusterfs', 'iscsi']
else:
facts['node']['storage_plugin_deps'] = []
--
cgit v1.2.3
From 2419624b7aa8b626bf537ef106af9836aefa5035 Mon Sep 17 00:00:00 2001
From: Robert van Veelen <rvanveelen@tremorvideo.com>
Date: Wed, 10 Feb 2016 16:28:37 +0000
Subject: add default storage plugins to 'origin' deployment_type
---
roles/openshift_facts/library/openshift_facts.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'roles')
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 71397275a..01329d008 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -711,7 +711,7 @@ def set_deployment_facts_if_unset(facts):
if 'node' in facts:
deployment_type = facts['common']['deployment_type']
if 'storage_plugin_deps' not in facts['node']:
- if deployment_type in ['openshift-enterprise', 'atomic-enterprise']:
+ if deployment_type in ['openshift-enterprise', 'atomic-enterprise', 'origin']:
facts['node']['storage_plugin_deps'] = ['ceph', 'glusterfs', 'iscsi']
else:
facts['node']['storage_plugin_deps'] = []
--
cgit v1.2.3