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/main.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/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 |