summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-06-14 17:20:13 -0400
committerTim Rozet <trozet@redhat.com>2016-06-15 20:24:43 +0000
commit2a45bf8929c37396d789b1858bd32edf4de58e51 (patch)
tree5c5e3def313f545404d57be3cbec5ac939711706 /build
parenta5967c102534cfe5a12850a8e34634e997c08b03 (diff)
Fixes nic templates for ovs dpdk
JIRA: APEX-119 Change-Id: Ia66f2ef4c169187b0cb575b10292d02f530b9902 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build')
-rw-r--r--build/nics-compute.yaml.jinja219
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