From 6bfab6c7e79ed029a9102ff7b7955b0a71f13c6d Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Sun, 6 Aug 2017 21:55:44 -0400 Subject: Add os-odl-fdio-dvr support apex-tripleo-heat-templates: I6a83c9e2deeb0df9a3ab09a707c9c64aa84da55e apex-puppet-tripleo: I2025e3157b97b376b63002003ca17c7206aba546 JIRA: APEX-466 Change-Id: Iedb75994d35b5dc1dd5d5ce1a57277c8f3729dfd Signed-off-by: Feng Pan --- build/nics-template.yaml.jinja2 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'build/nics-template.yaml.jinja2') diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2 index 23016183..93d3dc14 100644 --- a/build/nics-template.yaml.jinja2 +++ b/build/nics-template.yaml.jinja2 @@ -131,8 +131,17 @@ resources: ip_netmask: {get_param: InternalApiIpSubnet} {%- endif %} {%- else %} - type: interface + type: {{ nets['admin']['nic_mapping'][role]['phys_type'] }} + {%- if nets['admin']['nic_mapping'][role]['phys_type'] == 'linux_bridge' %} + name: br-ctlplane + members: + - + type: interface + name: {{ nets['admin']['nic_mapping'][role]['members'][0] }} + primary: true + {%- else %} name: {{ nets['admin']['nic_mapping'][role]['members'][0] }} + {%- endif %} {%- endif %} use_dhcp: false dns_servers: {get_param: DnsServers} -- cgit 1.2.3-korg