summaryrefslogtreecommitdiffstats
path: root/roles/openshift_management/tasks/storage/nfs.yml
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2018-01-29 15:30:30 -0500
committerRussell Teague <rteague@redhat.com>2018-01-29 15:52:25 -0500
commit53ed4ededbbac3ca0095051885aecd0674fbf867 (patch)
treee4273a4f59b2d394a5f14434de00e987bf14295e /roles/openshift_management/tasks/storage/nfs.yml
parent2ec70a36f50f670887f2f257d348db6332de5d26 (diff)
downloadopenshift-53ed4ededbbac3ca0095051885aecd0674fbf867.tar.gz
openshift-53ed4ededbbac3ca0095051885aecd0674fbf867.tar.bz2
openshift-53ed4ededbbac3ca0095051885aecd0674fbf867.tar.xz
openshift-53ed4ededbbac3ca0095051885aecd0674fbf867.zip
[1538960] Correct ability to overried 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.yml10
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 }}"