diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-30 06:40:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-30 06:40:50 -0800 |
| commit | 1dc61697707d43435523a14dda5abe304b198b49 (patch) | |
| tree | 852bbd3b1d3a214b34e7f9aae9baf24be7da3c03 /roles/openshift_management/tasks/storage/nfs.yml | |
| parent | 93cc482436b566d76ddcb6cf4cbd6b830b33fe40 (diff) | |
| parent | 53ed4ededbbac3ca0095051885aecd0674fbf867 (diff) | |
| download | openshift-1dc61697707d43435523a14dda5abe304b198b49.tar.gz openshift-1dc61697707d43435523a14dda5abe304b198b49.tar.bz2 openshift-1dc61697707d43435523a14dda5abe304b198b49.tar.xz openshift-1dc61697707d43435523a14dda5abe304b198b49.zip | |
Merge pull request #6925 from mtnbikenc/fix-1538960
Automatic merge from submit-queue.
[Bug 1538960] Correct ability to override openshift_management_app_template
* Converted 'flavor' logic to be based on app template
* Converted 'ext-db' logic to use var based on app template
* Prepended role private vars with '__' for consistency
Bug 1538960
https://bugzilla.redhat.com/show_bug.cgi?id=1538960
Diffstat (limited to 'roles/openshift_management/tasks/storage/nfs.yml')
| -rw-r--r-- | roles/openshift_management/tasks/storage/nfs.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/roles/openshift_management/tasks/storage/nfs.yml b/roles/openshift_management/tasks/storage/nfs.yml index 9e3a4d43a..4a00efb1d 100644 --- a/roles/openshift_management/tasks/storage/nfs.yml +++ b/roles/openshift_management/tasks/storage/nfs.yml @@ -17,8 +17,8 @@ tasks_from: create_export vars: l_nfs_base_dir: "{{ openshift_management_storage_nfs_base_dir }}" - l_nfs_export_config: "{{ openshift_management_flavor_short }}" - l_nfs_export_name: "{{ openshift_management_flavor_short }}-app" + l_nfs_export_config: "{{ __openshift_management_flavor_short }}" + l_nfs_export_name: "{{ __openshift_management_flavor_short }}-app" l_nfs_options: "*(rw,no_root_squash,no_wdelay)" - name: Create the DB export @@ -27,10 +27,10 @@ tasks_from: create_export vars: l_nfs_base_dir: "{{ openshift_management_storage_nfs_base_dir }}" - l_nfs_export_config: "{{ openshift_management_flavor_short }}" - l_nfs_export_name: "{{ openshift_management_flavor_short }}-db" + l_nfs_export_config: "{{ __openshift_management_flavor_short }}" + l_nfs_export_name: "{{ __openshift_management_flavor_short }}-db" l_nfs_options: "*(rw,no_root_squash,no_wdelay)" when: - - openshift_management_app_template in ['miq-template', 'cfme-template'] + - not __openshift_management_use_ext_db delegate_to: "{{ openshift_management_nfs_server }}" |