diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-09-06 10:13:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-06 10:13:15 -0400 |
| commit | 5aaa24b25653cca479955eb39d353caee0fcf373 (patch) | |
| tree | fd31471a4f404097ad3289e8ab97276cc77b0cf5 | |
| parent | 89c58144a6c92c424a8aa968aa0409e9f936b3a6 (diff) | |
| parent | 87996bb4c88e78934e62818fac4b02714e1272d0 (diff) | |
| download | openshift-5aaa24b25653cca479955eb39d353caee0fcf373.tar.gz openshift-5aaa24b25653cca479955eb39d353caee0fcf373.tar.bz2 openshift-5aaa24b25653cca479955eb39d353caee0fcf373.tar.xz openshift-5aaa24b25653cca479955eb39d353caee0fcf373.zip | |
Merge pull request #5102 from ilackarms/fix-pv-template
only evaluate openshift_cfme_nfs_server if using nfs
| -rw-r--r-- | roles/openshift_cfme/defaults/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_cfme/tasks/nfs.yml | 7 |
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/ |