openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Don't run ephemeral heat for non enabled scenarios"

This commit is contained in:
Zuul 2021-06-03 18:46:33 +00:00 committed by Gerrit Code Review
parent 183b2c1f4b 149476a816
commit 582a38e241
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
roles/overcloud-deploy/templates/overcloud-deploy.sh.j2
View File

@ -62,10 +62,11 @@ fi
## * Deploy the overcloud!
## ::
openstack overcloud deploy --stack {{ stack_name }} {% if release is not in ['newton', 'ocata', 'pike', 'queens'] %}--override-ansible-cfg {{ working_dir }}/custom_ansible.cfg{% endif %} \
--templates {{overcloud_templates_path}} \
{{ deploy_args | regex_replace("\n", " ") }} \
"$@" && status_code=0 || status_code=$?
openstack overcloud deploy --stack {{ stack_name }} \
{% if release is not in ['newton', 'ocata', 'pike', 'queens'] %}--override-ansible-cfg {{ working_dir }}/custom_ansible.cfg{% endif %} \
{% if release not in ['queens', 'stein', 'train', 'ussuri', 'victoria'] and not (ephemeral_heat|bool) %}--heat-type installed{% endif %} --templates {{overcloud_templates_path}} \
{{ deploy_args | regex_replace("\n", " ") }} \
"$@" && status_code=0 || status_code=$?
### --stop_docs