summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-12-10 13:55:12 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-12-10 13:55:12 +0000
commitb8b72bc2de4dbdaee50ced1e3f9978880efa86ae (patch)
tree9ab18804aed34a259d16636007f765a4e3c219cd /mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight
parent38c2905e88a113ab8fbe10bb9e30a02294e66143 (diff)
parentb8a85f1c6213e3abaf295e7662c4b0df4570039b (diff)
Merge "[bgpvpn] Use Linux bridge for odl01 public network"
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight')
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j211
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 %}