summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Weiss <sdw35@cornell.edu>2017-08-16 11:46:27 +0300
committerScott Weiss <sdw35@cornell.edu>2017-09-03 12:27:18 +0300
commit87996bb4c88e78934e62818fac4b02714e1272d0 (patch)
tree135d4ed0e2432c1af8bc8e322146966c4de431ce
parent20cf3396e4aae5aef6485a23e6cc3134c7a2d1be (diff)
downloadopenshift-87996bb4c88e78934e62818fac4b02714e1272d0.tar.gz
openshift-87996bb4c88e78934e62818fac4b02714e1272d0.tar.bz2
openshift-87996bb4c88e78934e62818fac4b02714e1272d0.tar.xz
openshift-87996bb4c88e78934e62818fac4b02714e1272d0.zip
skip openshift_cfme_nfs_server if not using nfs
-rw-r--r--roles/openshift_cfme/defaults/main.yml3
-rw-r--r--roles/openshift_cfme/tasks/nfs.yml7
2 files changed, 7 insertions, 3 deletions
diff --git a/roles/openshift_cfme/defaults/main.yml b/roles/openshift_cfme/defaults/main.yml
index 8aa57e75a..b82c2e602 100644
--- a/roles/openshift_cfme/defaults/main.yml
+++ b/roles/openshift_cfme/defaults/main.yml
@@ -27,9 +27,6 @@ openshift_cfme_pv_data:
# Tuning parameter to use more than 5 images at once from an ImageStream
openshift_cfme_maxImagesBulkImportedPerRepository: 100
-# Hostname/IP of the NFS server. Currently defaults to first master
-openshift_cfme_nfs_server: "{{ groups.nfs.0 }}"
-openshift_cfme_nfs_directory: "/exports"
# TODO: Refactor '_install_app' variable. This is just for testing but
# maybe in the future it should control the entire yes/no for CFME.
#
diff --git a/roles/openshift_cfme/tasks/nfs.yml b/roles/openshift_cfme/tasks/nfs.yml
index 8db45492e..ca04628a8 100644
--- a/roles/openshift_cfme/tasks/nfs.yml
+++ b/roles/openshift_cfme/tasks/nfs.yml
@@ -1,6 +1,13 @@
---
# Tasks to statically provision NFS volumes
# Include if not using dynamic volume provisioning
+
+- name: Set openshift_cfme_nfs_server fact
+ when: openshift_cfme_nfs_server is not defined
+ set_fact:
+ # Hostname/IP of the NFS server. Currently defaults to first master
+ openshift_cfme_nfs_server: "{{ oo_nfs_to_config.0 }}"
+
- name: Ensure the /exports/ directory exists
file:
path: /exports/