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/vars | |
| 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/vars')
| -rw-r--r-- | roles/openshift_management/vars/main.yml | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/roles/openshift_management/vars/main.yml b/roles/openshift_management/vars/main.yml index da3ad0af7..d7b18df3a 100644 --- a/roles/openshift_management/vars/main.yml +++ b/roles/openshift_management/vars/main.yml @@ -30,14 +30,18 @@ __openshift_management_db_parameters: - DATABASE_PORT - DATABASE_NAME -# # Commented out until we can support both CFME and MIQ -# # openshift_management_flavor: "{{ 'cloudforms' if openshift_deployment_type == 'openshift-enterprise' else 'manageiq' }}" -#openshift_management_flavor: cloudforms -openshift_management_flavor: manageiq -# TODO: Make this conditional as well based on the prior variable -# # openshift_management_flavor_short: "{{ 'cfme' if openshift_deployment_type == 'openshift-enterprise' else 'miq' }}" -# openshift_management_flavor_short: cfme -openshift_management_flavor_short: miq +__openshift_management_flavors: + miq: + short: miq + long: manageiq + cfme: + short: cfme + long: cloudforms + +__openshift_management_flavor: "{{ __openshift_management_flavors[openshift_management_app_template.split('-')[0]]['long'] }}" +__openshift_management_flavor_short: "{{ __openshift_management_flavors[openshift_management_app_template.split('-')[0]]['short'] }}" + +__openshift_management_use_ext_db: "{{ true if 'ext-db' in openshift_management_app_template else false }}" ###################################################################### # ACCOUNTING |