diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-06-17 14:55:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-17 14:55:18 +0000 |
| commit | a1fe1a29a0e9f794395e4b31306a32cd7ec8cb44 (patch) | |
| tree | afd9be58bd36f2735748659aea5c4d1c6ac36c31 /build | |
| parent | 85759538077aad6e3c2e87ac7a6be5a2f1fb8803 (diff) | |
| parent | 2a45bf8929c37396d789b1858bd32edf4de58e51 (diff) | |
Merge "Fixes nic templates for ovs dpdk"
Diffstat (limited to 'build')
| -rw-r--r-- | build/nics-compute.yaml.jinja2 | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/build/nics-compute.yaml.jinja2 b/build/nics-compute.yaml.jinja2 index 3a73bbd8..1bc2b50a 100644 --- a/build/nics-compute.yaml.jinja2 +++ b/build/nics-compute.yaml.jinja2 @@ -105,6 +105,24 @@ resources: next_hop: {get_param: ControlPlaneDefaultRoute} {%- set nic_index = 2 %} {%- if 'private_network' in enabled_networks %} + {%- if ovs_dpdk_bridge == 'br-phy' %} + - + type: interface + name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %} + use_dhcp: false + + - + type: ovs_bridge + name: {{ ovs_dpdk_bridge }} + use_dhcp: false + addresses: + - + ip_netmask: {get_param: TenantIpSubnet} + - + type: ovs_bridge + name: br-tun + use_dhcp: false + {%- else %} - type: interface name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %} @@ -113,6 +131,7 @@ resources: - ip_netmask: {get_param: TenantIpSubnet} {%- endif %} + {%- endif %} {%- if external_net_type == "interface" %} - type: interface |