Browse Source

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
changes/42/653842/2
James Slagle 3 years ago
parent
commit
e0d26441f1
  1. 5
      common/deploy-steps.j2
  2. 1
      overcloud.j2.yaml

5
common/deploy-steps.j2

@ -110,6 +110,10 @@ parameters:
type: number
default: {{role.CountDefault|default(0)}}
{% endfor %}
ServiceNetMapLower:
description: Mapping of service name to network name
type: json
default: {}
conditions:
{% for role in enabled_roles %}
@ -237,6 +241,7 @@ outputs:
global_vars:
deploy_steps_max: {{deploy_steps_max}}
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}
docker_puppet_script: {get_file: ./container-puppet.py}
deploy_steps_playbook:

1
overcloud.j2.yaml

@ -1036,6 +1036,7 @@ resources:
{%- for role in roles %}
{{role.name}}Count: {get_param: {{role.name}}Count}
{%- endfor %}
ServiceNetMapLower: {get_attr: [ServiceNetMap, service_net_map_lower]}
ServerOsCollectConfigData:
type: OS::Heat::Value

Loading…
Cancel
Save