diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-11-21 08:43:01 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2016-11-30 14:22:36 -0500 |
| commit | f02742a981a602b439c918236bdb771bbf13dc97 (patch) | |
| tree | 368215eaaa0854dca5fe2f4ad7b1c64edc98dc77 /overcloud.j2.yaml | |
| parent | 6df32707e9698da5a647aff2b20e6fc2617ea1d2 (diff) | |
Configure /etc/hosts via os-collect-config script
This patch moves the t-i-e element code for hosts configuration
into a t-h-t shell script that gets driven by a os-collect-config
script hook.
This helps accomplish several goals:
- moves us away from t-i-e
- gives us better signal handling in the error case (where the
previous element relied on 99-refresh-completed
- Allows the t-h-t undercloud installer to more easily consume this
since it doesn't rely on the old os-apply-config metadata (which
that installer doesn't support).
Change-Id: I73c3d4818ef531a3559fab272521f44519e2f486
Diffstat (limited to 'overcloud.j2.yaml')
| -rw-r--r-- | overcloud.j2.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index ba1c6b36..6146a48a 100644 --- a/overcloud.j2.yaml +++ b/overcloud.j2.yaml @@ -187,7 +187,7 @@ resources: type: string value: list_join: - - '\n' + - "\n" - - str_replace: template: IP HOST params: @@ -370,7 +370,7 @@ resources: properties: hosts: list_join: - - '\n' + - "\n" - - if: - add_vips_to_etc_hosts - {get_attr: [VipHosts, value]} @@ -378,7 +378,7 @@ resources: - {% for role in roles %} - list_join: - - '\n' + - "\n" - {get_attr: [{{role.name}}, hosts_entry]} {% endfor %} |