diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-12-09 15:34:52 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-12-10 13:55:16 +0000 |
| commit | 95daefcd14732b643ca98debe1dc608a09be09fa (patch) | |
| tree | f2ada3a3df22d7d407c06ce075d0e0bbe2f99848 /mcp | |
| parent | fb7a82b9e6fe9d43deac2249ec1ec204e022887e (diff) | |
[bgpvpn] Use Linux bridge for odl01 public network
Previously, we used a single interface definition for public network
on odl01 node, which does not work well for baremetal setups that
use a tagged VLAN public network, like ericsson-pod1.
Change-Id: I10ff7c105406691011e94e06b2f099dc2cdf8a06
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit b8a85f1c6213e3abaf295e7662c4b0df4570039b)
Diffstat (limited to 'mcp')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 index 95f3ee385..b21131dfe 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 @@ -10,6 +10,10 @@ {#- Filter-out NIC duplicates by constructing a dict (used NICs only) #} {%- set nics = { nm.ctl01.nic_mgmt: True } %} {%- set vlans = { nm.vlan_mgmt: nm.ctl01.nic_mgmt } %} +{%- if '-bgpvpn-' in conf.MCP_DEPLOY_SCENARIO %} + {%- do nics.update({nm.ctl01.nic_public: True}) %} + {%- do vlans.update({nm.vlan_public: nm.ctl01.nic_public}) %} +{%- endif %} --- parameters: linux: @@ -28,14 +32,15 @@ parameters: name_servers: - {{ nm.net_admin_gw }} {%- if '-bgpvpn-' in conf.MCP_DEPLOY_SCENARIO %} - external: + br-ext: enabled: true - name: {{ nm.ctl01.nic_public }} + type: bridge proto: static - type: eth address: ${_param:opnfv_opendaylight_server_external_address} netmask: ${_param:opnfv_net_public_mask} mtu: ${_param:interface_mtu} + use_interfaces: + - {{ ma.interface_str(nm.ctl01.nic_public, nm.vlan_public) }} noifupdown: true {%- endif %} |