From: Tim Rozet <trozet@redhat.com>
Date: Fri, 20 May 2016 16:04:07 +0000 (-0400)
Subject: Fixes tenant network templates
X-Git-Tag: colorado.1.0~233^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=08c44e734c45fc370c8d34547a65e226d929075f;hp=-c;p=apex.git

Fixes tenant network templates

We only support vxlan tenant network types in OPNFV.  There is no need
to create a br-tenant.

Change-Id: Ib84cde7207375ea033518dce99309620f575cb69
Signed-off-by: Tim Rozet <trozet@redhat.com>
---

08c44e734c45fc370c8d34547a65e226d929075f
diff --git a/build/nics-compute.yaml.jinja2 b/build/nics-compute.yaml.jinja2
index 12d90596..3a73bbd8 100644
--- a/build/nics-compute.yaml.jinja2
+++ b/build/nics-compute.yaml.jinja2
@@ -106,20 +106,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 %}
             {%- if external_net_type == "interface" %}
             -
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