[IDF] infra VMs: Allow trunking mgmt network

Due to design limitations in idf.net_config, for a hybrid POD we need
to trunk certain network segments for the VMs running on the
jumpserver, including mgmt network going to cfg01, mas01.

Add mgmt VLAN support for cfg01, mas01 gated by a flag in IDF:
  idf.fuel.jumphost.trunks.mgmt: True

JIRA: FUEL-338

Change-Id: I6903f9b70e5f8a88618bce28e21c7c0631a05065
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

1 files changed, 11 insertions, 1 deletions

diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
index b4afdd9d1..7ee1aa13f 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
@@ -163,11 +163,21 @@ parameters:
         primary_interface:
           enabled: true
           name: ${_param:primary_interface}
+          type: eth
+{%- if conf.idf.fuel.jumphost.get('trunks', {}).get('mgmt', False) and (nm.vlan_mgmt | int > 0) %}
+          proto: manual
           mtu: ${_param:interface_mtu}
+        primary_interface_vlan:
+          enabled: true
+          type: vlan
+          name: ${_param:primary_interface}.{{ nm.vlan_mgmt }}
+          use_interfaces:
+            - ${_param:primary_interface}
+{%- endif %}
           proto: static
+          mtu: ${_param:interface_mtu}
           address: ${_param:infra_maas_node01_address}
           netmask: ${_param:opnfv_net_mgmt_mask}
-          type: eth
         pxe_admin_interface:
           enabled: true
           name: ${_param:pxe_admin_interface}