diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2 index 2f5d5be143..b88e69a1b5 100644 --- a/common/deploy-steps.j2 +++ b/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: diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index fe7f01267b..4837f87163 100644 --- a/overcloud.j2.yaml +++ b/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