diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2020-01-28 15:06:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2020-01-28 15:06:51 +0000 |
| commit | 7d14e146caece71c0265d85a922966d064a15388 (patch) | |
| tree | b4baa14fc017aea5602ee37c1ca886f3c1c71f55 /mcp/reclass/classes | |
| parent | 1f874e5ea342c221b5cf3c9a544020be9a820481 (diff) | |
| parent | 09fe020035e8acdab02d22a23216c4dab9ce51f8 (diff) | |
Merge "odl-ovs noha: Support VLAN tagged public" into stable/iruya
Diffstat (limited to 'mcp/reclass/classes')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 | 13 |
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 |