aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2020-01-17 21:18:09 +0000
committerGerrit Code Review <gerrit@opnfv.org>2020-01-17 21:18:09 +0000
commit522e509c904c6e8ccdfedc44798832a92238b3dc (patch)
tree5e2505cac3585be6bc80f341ee01124f6bd663b6 /mcp/reclass
parent4deaa15d1e8a9e0e7e0bfb26d4cf3c1b2450c1a1 (diff)
parent1a8c8c147a0ac647ea19794eb40ed5fb8eedf819 (diff)
Merge "odl-ovs noha: Support VLAN tagged public"
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