openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Removed the release check from the pre-deploy task."

Browse Source
This commit is contained in:
Zuul 2019-03-08 05:39:16 +00:00 committed by Gerrit Code Review
commit 29857bee45
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/overcloud-deploy/tasks/pre-deploy.yml
View File

@ -190,11 +190,7 @@
{% if enable_pacemaker|bool or osp_release is defined%}
-e {{ overcloud_templates_path }}/environments/docker-ha.yaml
{% endif %}
{% if release in ['ocata', 'pike', 'queens', 'rocky'] %}
-e {{ working_dir }}/containers-default-parameters.yaml
{% else %}
-e {{ working_dir }}/containers-prepare-parameter.yaml
{% endif %}
{% if release not in ['pike', 'queens', 'rocky'] %}
-e {{ overcloud_templates_path }}/environments/{{ overcloud_container_cli | default('docker') }}.yaml
{% endif %}