summaryrefslogtreecommitdiffstats
path: root/build/nics-controller.yaml.jinja2
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-05-20 19:05:36 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-05-20 19:05:36 +0000
commitd15f7639b32faf16e4bf9010e7a5f2aa86ff4e03 (patch)
tree30980fd89fd1903ff3171dfc43d69eaf03ae70bd /build/nics-controller.yaml.jinja2
parent1813eb19f734b3b5661b697469ff075bc06a79eb (diff)
parent08c44e734c45fc370c8d34547a65e226d929075f (diff)
Merge "Fixes tenant network templates"
Diffstat (limited to 'build/nics-controller.yaml.jinja2')
-rw-r--r--build/nics-controller.yaml.jinja212
1 files changed, 2 insertions, 10 deletions
diff --git a/build/nics-controller.yaml.jinja2 b/build/nics-controller.yaml.jinja2
index d135e2e5..d97ee394 100644
--- a/build/nics-controller.yaml.jinja2
+++ b/build/nics-controller.yaml.jinja2
@@ -104,20 +104,12 @@ resources:
{%- set nic_index = 2 %}
{%- if 'private_network' in enabled_networks %}
-
- # Create a bridge which can also be used for VLAN-mode bridge mapping
- type: ovs_bridge
- name: br-tenant
+ type: interface
+ name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %}
use_dhcp: false
addresses:
-
ip_netmask: {get_param: TenantIpSubnet}
- members:
- -
- type: interface
- name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %}
- use_dhcp: false
- # force the MAC address of the bridge to this interface
- primary: true
{%- endif %}
-
type: ovs_bridge