openstack/tripleo-heat-templates
Code Issues Proposed changes

Use ansible group_vars for service_configs hieradata

Browse Source 
Change-Id: Ifa05dc0bce634ad06efa7f4658845c8d6d044818
Depends-On: https://review.opendev.org/#/c/673727
This commit is contained in:
Rabi Mishra 2019-07-30 21:38:38 +05:30
parent 29a499d665
commit 5b2d2795a8
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/deploy-steps.j2
View File

@ -542,6 +542,7 @@ outputs:
- net_ip_map - net_ip_map
- cloud_domain - cloud_domain
- fqdn - fqdn
- service_configs
when: tripleo_role_name == '{{role.name}}' when: tripleo_role_name == '{{role.name}}'
tags: tags:
- overcloud - overcloud

6
overcloud.j2.yaml
View File

@ -491,7 +491,6 @@ resources:
type: json type: json
value: value:
datafiles: datafiles:
service_configs: {get_attr: [{{role.name}}ServiceConfigSettings, value]}
{{role.name.lower()}}_extraconfig: {{role.name.lower()}}_extraconfig:
map_merge: map_merge:
- sensu::subscriptions: {get_attr: [{{role.name}}ServiceChainRoleData, value, monitoring_subscriptions]} - sensu::subscriptions: {get_attr: [{{role.name}}ServiceChainRoleData, value, monitoring_subscriptions]}
@ -1061,7 +1060,10 @@ outputs:
value: value:
{%- for role in roles %} {%- for role in roles %}
{{role.name}}: {{role.name}}:
map_merge: {get_attr: [{{role.name}}, role_group_vars]} map_merge:
list_concat:
- {get_attr: [{{role.name}}, role_group_vars]}
- [service_configs: {get_attr: [{{role.name}}ServiceConfigSettings, value]}]
{%- endfor %} {%- endfor %}
RoleNetHostnameMap: RoleNetHostnameMap:
description: Mapping of each network to a list of hostnames for each role description: Mapping of each network to a list of hostnames for each role