summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert van Veelen <rvanveelen@tremorvideo.com>2016-02-10 15:47:34 +0000
committerRobert van Veelen <rvanveelen@tremorvideo.com>2016-02-10 15:47:34 +0000
commit491890380ff509f10d9e2635641874d681eca772 (patch)
treed067a0c6df10c8173845b1d5d7fe798b98dd66c1
parent0dd276d51c5738533f993c44b39db8a7f2f43dfc (diff)
downloadopenshift-491890380ff509f10d9e2635641874d681eca772.tar.gz
openshift-491890380ff509f10d9e2635641874d681eca772.tar.bz2
openshift-491890380ff509f10d9e2635641874d681eca772.tar.xz
openshift-491890380ff509f10d9e2635641874d681eca772.zip
update defaults and examples w/ iscsi plugin
-rw-r--r--inventory/byo/hosts.aep.example2
-rw-r--r--inventory/byo/hosts.origin.example2
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/inventory/byo/hosts.aep.example b/inventory/byo/hosts.aep.example
index 915a82579..ca625d956 100644
--- a/inventory/byo/hosts.aep.example
+++ b/inventory/byo/hosts.aep.example
@@ -142,7 +142,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
# default storage plugin dependencies to install, by default the ceph and
# glusterfs plugin dependencies will be installed, if available.
-#osn_storage_plugin_deps=['ceph','glusterfs']
+#osn_storage_plugin_deps=['ceph','glusterfs','iscsi']
# default selectors for router and registry services
# openshift_router_selector='region=infra'
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
index 4fe514d97..7eeb9ef37 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -147,7 +147,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
# default storage plugin dependencies to install, by default the ceph and
# glusterfs plugin dependencies will be installed, if available.
-#osn_storage_plugin_deps=['ceph','glusterfs']
+#osn_storage_plugin_deps=['ceph','glusterfs','iscsi']
# default selectors for router and registry services
# openshift_router_selector='region=infra'
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'] = []