Merge "Add extraconfig/role_extraconfig template to hieradata"
This commit is contained in:
commit
960e6da0dc
@ -42,7 +42,8 @@
|
|||||||
# other_hierafile:
|
# other_hierafile:
|
||||||
# foo: bar3
|
# foo: bar3
|
||||||
- name: Copy hieradata files for all hosts
|
- name: Copy hieradata files for all hosts
|
||||||
when: not hieradata_per_host|bool
|
when: hieradata_template != "" and not hieradata_per_host|bool
|
||||||
|
ignore_errors: yes
|
||||||
include: all_hosts.yaml
|
include: all_hosts.yaml
|
||||||
vars:
|
vars:
|
||||||
hieradata_content: "{{ lookup('file', hieradata_template ~ '.rendered') | from_yaml }}"
|
hieradata_content: "{{ lookup('file', hieradata_template ~ '.rendered') | from_yaml }}"
|
||||||
@ -65,7 +66,8 @@
|
|||||||
# other_hierafile:
|
# other_hierafile:
|
||||||
# foo: bar
|
# foo: bar
|
||||||
- name: Copy hieradata files per host
|
- name: Copy hieradata files per host
|
||||||
when: hieradata_per_host|bool
|
when: hieradata_template != "" and hieradata_per_host|bool
|
||||||
|
ignore_errors: yes
|
||||||
include: per_host.yaml host={{ inventory_hostname }} data={{ hieradata_content[inventory_hostname] }}
|
include: per_host.yaml host={{ inventory_hostname }} data={{ hieradata_content[inventory_hostname] }}
|
||||||
vars:
|
vars:
|
||||||
hieradata_content: "{{ lookup('file', hieradata_template ~ '.rendered') | from_yaml }}"
|
hieradata_content: "{{ lookup('file', hieradata_template ~ '.rendered') | from_yaml }}"
|
||||||
|
1
roles/tripleo-hieradata/templates/extraconfig.j2
Normal file
1
roles/tripleo-hieradata/templates/extraconfig.j2
Normal file
@ -0,0 +1 @@
|
|||||||
|
{{ extraconfig | to_nice_json }}
|
1
roles/tripleo-hieradata/templates/role_extraconfig.j2
Normal file
1
roles/tripleo-hieradata/templates/role_extraconfig.j2
Normal file
@ -0,0 +1 @@
|
|||||||
|
{{ role_extraconfig | to_nice_json }}
|
Loading…
Reference in New Issue
Block a user