[IDF] infra VMs: Allow trunking mgmt network

[fuel.git] / mcp / reclass / classes / cluster / mcp-odl-ha / infra / maas.yml.j2

diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-ha/infra/maas.yml.j2
index 30d7126..b5c40ef 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-odl-ha/infra/maas.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-ha/infra/maas.yml.j2
@@ -5,17 +5,12 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-{%- set cluster_arch = [] %}
-{%- for node in conf.nodes %}
-  {%- if node.node.arch not in cluster_arch %}
-    {%- do cluster_arch.append(node.node.arch) %}
-  {%- endif %}
-{%- endfor %}
+{%- import 'net_map.j2' as nm with context %}
 ---
 classes:
-  - cluster.mcp-common-ha.infra.maas
+  - cluster.all-mcp-arch-common.infra.maas
   - cluster.mcp-odl-ha.infra
-{%- if 'aarch64' not in cluster_arch %}
+{%- if 'aarch64' not in nm.cluster.arch %}
 parameters:
   _param:
     hwe_kernel: 'ga-16.04'