diff options
author | Russell Teague <rteague@redhat.com> | 2018-01-29 15:30:30 -0500 |
---|---|---|
committer | Russell Teague <rteague@redhat.com> | 2018-01-29 15:52:25 -0500 |
commit | 53ed4ededbbac3ca0095051885aecd0674fbf867 (patch) | |
tree | e4273a4f59b2d394a5f14434de00e987bf14295e /roles/openshift_management/tasks/storage/create_nfs_pvs.yml | |
parent | 2ec70a36f50f670887f2f257d348db6332de5d26 (diff) | |
download | openshift-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/create_nfs_pvs.yml')
-rw-r--r-- | roles/openshift_management/tasks/storage/create_nfs_pvs.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/roles/openshift_management/tasks/storage/create_nfs_pvs.yml b/roles/openshift_management/tasks/storage/create_nfs_pvs.yml index d1b9a8d5c..1f8cac6c6 100644 --- a/roles/openshift_management/tasks/storage/create_nfs_pvs.yml +++ b/roles/openshift_management/tasks/storage/create_nfs_pvs.yml @@ -12,7 +12,7 @@ when: - openshift_management_template_parameters.APPLICATION_VOLUME_CAPACITY is not defined -- when: openshift_management_app_template in ['miq-template', 'cfme-template'] +- when: not __openshift_management_use_ext_db block: - name: Note the DB PV Size from Template Parameters set_fact: @@ -31,7 +31,7 @@ namespace: "{{ openshift_management_project }}" state: list kind: pv - name: "{{ openshift_management_flavor_short }}-app" + name: "{{ __openshift_management_flavor_short }}-app" register: miq_app_pv_check - name: Check if the Management DB PV has been created @@ -39,15 +39,15 @@ namespace: "{{ openshift_management_project }}" state: list kind: pv - name: "{{ openshift_management_flavor_short }}-db" + name: "{{ __openshift_management_flavor_short }}-db" register: miq_db_pv_check when: - - openshift_management_app_template in ['miq-template', 'cfme-template'] + - not __openshift_management_use_ext_db - name: Ensure the Management App PV is created oc_process: namespace: "{{ openshift_management_project }}" - template_name: "{{ openshift_management_flavor }}-app-pv" + template_name: "{{ __openshift_management_flavor }}-app-pv" create: True params: PV_SIZE: "{{ openshift_management_app_pv_size }}" @@ -58,12 +58,12 @@ - name: Ensure the Management DB PV is created oc_process: namespace: "{{ openshift_management_project }}" - template_name: "{{ openshift_management_flavor }}-db-pv" + template_name: "{{ __openshift_management_flavor }}-db-pv" create: True params: PV_SIZE: "{{ openshift_management_db_pv_size }}" BASE_PATH: "{{ openshift_management_storage_nfs_base_dir }}" NFS_HOST: "{{ openshift_management_nfs_server }}" when: - - openshift_management_app_template in ['miq-template', 'cfme-template'] + - not __openshift_management_use_ext_db - miq_db_pv_check.results.results == [{}] |