diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-17 12:51:05 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-08-17 12:51:05 +0000 |
commit | ce006d7e483ae07279f0c036616d8896f18f7000 (patch) | |
tree | 383cd5e25aa8ec21b01aa6e40e79e93ecf77c4a9 /mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight | |
parent | c2902b924da9b2246ec80e7b541950b26ebc8cde (diff) | |
parent | 2a1201f80fe5800ffbdf71917eddfeb3a5f6c4c1 (diff) |
Merge "[noha] Parameterize network configuration"
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.j2 | 24 |
1 files changed, 20 insertions, 4 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 bd7c91079..5e647d0c0 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 @@ -6,6 +6,10 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## {%- import 'net_map.j2' as nm with context %} +{%- import 'net_macros.j2' as ma with context %} +{#- 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 } %} --- parameters: linux: @@ -18,14 +22,26 @@ parameters: type: eth address: ${_param:pxe_admin_address} netmask: ${_param:opnfv_net_admin_mask} + mtu: ${_param:interface_mtu} + noifupdown: true gateway: {{ nm.net_admin_gw }} name_servers: - {{ nm.net_admin_gw }} - noifupdown: true - single_int: + +{#- prevent duplicates for tagged mgmt on the same physical interface as PXE/admin #} +{%- if nm.ctl01.nic_admin in nics %} + {%- do nics.pop(nm.ctl01.nic_admin) %} +{%- endif %} + +{{ ma.linux_network_interfaces_nic(nics) }} + +{{ ma.linux_network_interfaces_vlan(vlans) }} + + br-ctl: enabled: true - name: {{ nm.ctl01.nic_mgmt }} - type: eth + type: bridge proto: static address: ${_param:single_address} netmask: ${_param:opnfv_net_mgmt_mask} + use_interfaces: + - {{ ma.interface_str(nm.ctl01.nic_mgmt, nm.vlan_mgmt) }} |