Add ServiceNetMap to global_vars
This adds the ServiceNetMap value to global_vars for config-download. This will make the value consumable from ansible tasks when running config-download. Additional values can be added in a similar fashion in the future to allow for less hardcoded data coming out of Heat, and instead using jinja expressions to consume data from Ansible variables when config-download runs. Change-Id: I8c442caac140f1c96123c1be47e858949419fd8f
This commit is contained in:
parent
bfd3fea2ef
commit
e0d26441f1
|
@ -110,6 +110,10 @@ parameters:
|
||||||
type: number
|
type: number
|
||||||
default: {{role.CountDefault|default(0)}}
|
default: {{role.CountDefault|default(0)}}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
ServiceNetMapLower:
|
||||||
|
description: Mapping of service name to network name
|
||||||
|
type: json
|
||||||
|
default: {}
|
||||||
|
|
||||||
conditions:
|
conditions:
|
||||||
{% for role in enabled_roles %}
|
{% for role in enabled_roles %}
|
||||||
|
@ -237,6 +241,7 @@ outputs:
|
||||||
global_vars:
|
global_vars:
|
||||||
deploy_steps_max: {{deploy_steps_max}}
|
deploy_steps_max: {{deploy_steps_max}}
|
||||||
ssh_known_hosts: {get_param: ssh_known_hosts_hostnames}
|
ssh_known_hosts: {get_param: ssh_known_hosts_hostnames}
|
||||||
|
service_net_map: {get_param: ServiceNetMapLower}
|
||||||
common_deploy_steps_tasks: {get_file: deploy-steps-tasks.yaml}
|
common_deploy_steps_tasks: {get_file: deploy-steps-tasks.yaml}
|
||||||
docker_puppet_script: {get_file: ./container-puppet.py}
|
docker_puppet_script: {get_file: ./container-puppet.py}
|
||||||
deploy_steps_playbook:
|
deploy_steps_playbook:
|
||||||
|
|
|
@ -1036,6 +1036,7 @@ resources:
|
||||||
{%- for role in roles %}
|
{%- for role in roles %}
|
||||||
{{role.name}}Count: {get_param: {{role.name}}Count}
|
{{role.name}}Count: {get_param: {{role.name}}Count}
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
|
ServiceNetMapLower: {get_attr: [ServiceNetMap, service_net_map_lower]}
|
||||||
|
|
||||||
ServerOsCollectConfigData:
|
ServerOsCollectConfigData:
|
||||||
type: OS::Heat::Value
|
type: OS::Heat::Value
|
||||||
|
|
Loading…
Reference in New Issue