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/main.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/main.yml')
-rw-r--r-- | roles/openshift_management/tasks/main.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/roles/openshift_management/tasks/main.yml b/roles/openshift_management/tasks/main.yml index c4b204b98..5209eba56 100644 --- a/roles/openshift_management/tasks/main.yml +++ b/roles/openshift_management/tasks/main.yml @@ -71,15 +71,15 @@ # CREATE APP - name: Note the correct ext-db template name set_fact: - openshift_management_template_name: "{{ openshift_management_flavor }}-ext-db" + openshift_management_template_name: "{{ __openshift_management_flavor }}-ext-db" when: - - openshift_management_app_template in ['miq-template-ext-db', 'cfme-template-ext-db'] + - __openshift_management_use_ext_db - name: Note the correct podified db template name set_fact: - openshift_management_template_name: "{{ openshift_management_flavor }}" + openshift_management_template_name: "{{ __openshift_management_flavor }}" when: - - openshift_management_app_template in ['miq-template', 'cfme-template'] + - not __openshift_management_use_ext_db - name: Ensure the Management App is created oc_process: @@ -89,7 +89,7 @@ params: "{{ openshift_management_template_parameters }}" - name: Wait for the app to come up. May take several minutes, 30s check intervals, {{ openshift_management_pod_rollout_retries }} retries - command: "oc logs {{ openshift_management_flavor }}-0 -n {{ openshift_management_project }}" + command: "oc logs {{ __openshift_management_flavor }}-0 -n {{ openshift_management_project }}" register: app_seeding_logs until: app_seeding_logs.stdout.find('Server starting complete') != -1 delay: 30 |