openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix vlan id assignment with additional subnets" into stable/stein

This commit is contained in:
Zuul 2019-08-15 21:43:19 +00:00 committed by Gerrit Code Review
parent 2abd3eb26a 9af90d7401
commit 879e84d900
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/role.role.j2.yaml
View File

@ -283,7 +283,7 @@ parameters:
{%- set _role_net_subnet = role.networks[network.name].get('subnet') %}
{%- if _subnets and _role_net_subnet and _role_net_subnet in _subnets %}
{{network.name}}NetworkVlanID_{{_role_net_subnet}}:
default: {{_role_net_subnet.vlan|default(1)}}
default: {{network.subnets[_role_net_subnet].vlan|default(1)}}
description: >
Vlan ID for the {{network.name_lower}} network traffic for subnet
{{_role_net_subnet}}.