openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Share overcloud Heat templates for undercloud conf 

Now that we have --use-heat mode by default, allow
to alter the default location of tripleo heat templates for
undercloud as well.

Move related cleanup and output dir to the expected DEFAULT
namespace.

Related-bug: #1749683
Change-Id: I050c09c4447fa45dd6e82dc3199bec60b1a10696
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
This commit is contained in:
Bogdan Dobrelya 2018-03-22 16:27:07 +01:00
parent 3478139e95
commit 25174f1b0c
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
releasenotes/notes/undercloud_heat_templates_path-a28dd58b923aafae.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
Underclouds and overclouds may be installed with Heat templates fetched
into a custom location defined with ``overcloud_templates_path``.

33
roles/undercloud-deploy/templates/undercloud.conf.j2
View File

@ -257,6 +257,24 @@ custom_env_files = {{ undercloud_custom_env_files }}
#custom_env_files = <None>
{% endif %}
# Output directory for state, like downloaded ansible configs and
# processed heat templates for heat installer
{% if undercloud_undercloud_output_dir is defined %}
output_dir = {{undercloud_undercloud_output_dir}}
{% else %}
#output_dir = $HOME/.undercloud-heat-installer
{% endif %}
# Clean up mode for the temp files for heat installer on exit
{% if undercloud_undercloud_cleanup is defined and undercloud_undercloud_cleanup|bool %}
cleanup = {{undercloud_undercloud_cleanup}}
{% else %}
#cleanup = False
{% endif %}
# Heat templates directory
templates = {{overcloud_templates_path}}
# Extra config elements.
{% if undercloud_conf_extra != "" %}
{{ undercloud_conf_extra }}
@ -443,18 +461,3 @@ undercloud_swift_hash_suffix = {{undercloud_undercloud_swift_hash_suffix}}
{% else %}
#undercloud_swift_hash_suffix = <None>
{% endif %}
# Output directory for state, like downloaded ansible configs and
# processed heat templates for heat installer
{% if undercloud_undercloud_output_dir is defined %}
output_dir = {{undercloud_undercloud_output_dir}}
{% else %}
#output_dir = $HOME/.undercloud-heat-installer
{% endif %}
# Clean up mode for the temp files for heat installer on exit
{% if undercloud_undercloud_cleanup is defined and undercloud_undercloud_cleanup|bool %}
cleanup = {{undercloud_undercloud_cleanup}}
{% else %}
#cleanup = False
{% endif %}