aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2020-01-16 11:15:07 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2020-01-16 11:21:40 +0100
commit1a8c8c147a0ac647ea19794eb40ed5fb8eedf819 (patch)
tree65dd2920cb941c8f4e6344fc24a8cdb1fbff2418 /mcp/reclass
parent7fccfa4ebaf793bc77ec7160bdd661e5a8015162 (diff)
odl-ovs noha: Support VLAN tagged public
Some baremetal servers might have VLAN tagged public interfaces configured via PDF/IDF, adjust our compute networking j2 handling to accomodate that. Change-Id: I97c07f9742a09cd01e7aecf118ada270a682280e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass')
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j213
1 files changed, 8 insertions, 5 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2
index fe8e47649..44ebb86b1 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2
@@ -49,11 +49,14 @@ parameters:
netmask: ${_param:opnfv_net_private_mask}
{{ nm.cmp001.nic_private }}:
type: dpdk # Not a meaningful type, just match 'dpdk' for filtering
- {{ nm.cmp001.nic_public }}:
- enabled: true
- type: eth
- mtu: ${_param:interface_mtu}
- proto: manual
+
+{%- set nics = { nm.cmp001.nic_public: True } %}
+{%- set vlans = { nm.vlan_public: nm.cmp001.nic_public } %}
+
+{{ ma.linux_network_interfaces_nic(nics) }}
+
+{{ ma.linux_network_interfaces_vlan(vlans) }}
+
br-floating:
enabled: true
type: ovs_bridge