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/defaults | |
| 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/defaults')
| -rw-r--r-- | roles/openshift_management/defaults/main.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_management/defaults/main.yml b/roles/openshift_management/defaults/main.yml index b5e234b7f..57bc97e3e 100644 --- a/roles/openshift_management/defaults/main.yml +++ b/roles/openshift_management/defaults/main.yml @@ -15,6 +15,8 @@ openshift_management_pod_rollout_retries: 30 # # Choose 'miq-template' for a podified database install # Choose 'miq-template-ext-db' for an external database install +# TODO: Swap this var declaration once CFME is fully supported +#openshift_management_app_template: "{{ 'cfme-template' if openshift_deployment_type == 'openshift-enterprise' else 'miq-template' }}" openshift_management_app_template: miq-template # If you are using the miq-template-ext-db template then you must add # the required database parameters to the |