diff options
| author |   Feng Pan <fpan@redhat.com> | 2017-08-06 21:55:44 -0400 |
|---|---|---|
| committer | Feng Pan <fpan@redhat.com> | 2017-08-11 14:58:29 -0400 |
| commit | 6bfab6c7e79ed029a9102ff7b7955b0a71f13c6d (patch) | |
| tree | 6c85b73daba19e230c740d68f95db2c654c1171c /build/nics-template.yaml.jinja2 | |
| parent | 240fb2eeb9398871e55703f9e62bc7fbb4e01162 (diff) | |
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 <fpan@redhat.com>
Diffstat (limited to 'build/nics-template.yaml.jinja2')
| -rw-r--r-- | build/nics-template.yaml.jinja2 | 11 |
1 files changed, 10 insertions, 1 deletions
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} |