Merge "Adds nosdn-noha scenario and fixes opencontrail scenario naming"

diff --git a/build/nics-compute.yaml.jinja2 b/build/nics-compute.yaml.jinja2
index 12d9059..3a73bbd 100644 (file)
--- 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 d135e2e..d97ee39 100644 (file)
--- 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