X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Fnics-controller.yaml.jinja2;h=d97ee39401b5e53f9f66a9d37ed9cf1d96b29317;hb=2eaea7fdbbb95a00afb920f3381691cd67638d95;hp=d135e2e5f6057d436674a266bb58bf25e76a1a1d;hpb=50ec69e104bd2ce26f22521b9a3caa4c16e0bca7;p=apex.git 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