Merge "Don't run ephemeral heat for non enabled scenarios"
This commit is contained in:
commit
582a38e241
|
@ -62,8 +62,9 @@ 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}} \
|
||||
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=$?
|
||||
|
||||
|
|
Loading…
Reference in New Issue