Code Review
/
apex.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Removes building quagga/zrpc" into stable/danube
[apex.git]
/
build
/
nics-template.yaml.jinja2
diff --git
a/build/nics-template.yaml.jinja2
b/build/nics-template.yaml.jinja2
index
920e9a1
..
f2c8000
100644
(file)
--- a/
build/nics-template.yaml.jinja2
+++ b/
build/nics-template.yaml.jinja2
@@
-176,8
+176,8
@@
resources:
-
type: {{ nets['tenant']['nic_mapping'][role]['phys_type'] }}
name: {{ nets['tenant']['nic_mapping'][role]['members'][0] }}
-
type: {{ nets['tenant']['nic_mapping'][role]['phys_type'] }}
name: {{ nets['tenant']['nic_mapping'][role]['members'][0] }}
- {%- if 'uio
_
driver' in nets['tenant']['nic_mapping'][role] %}
- uio_driver: {{ nets['tenant']['nic_mapping'][role]['uio
_
driver'] }}
+ {%- if 'uio
-
driver' in nets['tenant']['nic_mapping'][role] %}
+ uio_driver: {{ nets['tenant']['nic_mapping'][role]['uio
-
driver'] }}
{%- endif %}
use_dhcp: false
addresses:
{%- endif %}
use_dhcp: false
addresses:
@@
-185,10
+185,13
@@
resources:
ip_netmask: {get_param: TenantIpSubnet}
{%- endif %}
{%- endif %}
ip_netmask: {get_param: TenantIpSubnet}
{%- endif %}
{%- endif %}
- {%- if nets['external'][0]['enabled'] and external_net_type
== 'interface
' and nets['external'][0]['nic_mapping'][role]['vlan'] == 'native' %}
+ {%- if nets['external'][0]['enabled'] and external_net_type
!= 'br-ex
' and nets['external'][0]['nic_mapping'][role]['vlan'] == 'native' %}
-
-
- type:
interface
+ type:
{{ nets['external'][0]['nic_mapping'][role]['phys_type'] }}
name: {{ nets['external'][0]['nic_mapping'][role]['members'][0] }}
name: {{ nets['external'][0]['nic_mapping'][role]['members'][0] }}
+ {%- if 'uio-driver' in nets['external'][0]['nic_mapping'][role] %}
+ uio_driver: {{ nets['external'][0]['nic_mapping'][role]['uio-driver'] }}
+ {%- endif %}
{%- if role == 'controller' %}
dns_servers: {get_param: DnsServers}
{%- endif %}
{%- if role == 'controller' %}
dns_servers: {get_param: DnsServers}
{%- endif %}