[baremetal] PDF-based network config

This change extends current PDF/IDF support with:
- dynamic interface / vlan definition;
- dynamic interface and/or bridge allocation of installer networks on
  top of interfaces (physical or vlans);

This allows us to drop hardcoded interface names and vlan / bridge
configuration in favor of a runtime determined model based on PDF/IDF.

For now, we duplicate common jinja variable definitions in each
template, but this will later be moved to a common include file.

JIRA: FUEL-275

Change-Id: Ia80a66dbdf898b0bd0a4fb99d069ce9ebe33fa65
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit c360b972649028d2613fc8561899c2c8b7f71832)

2 files changed, 80 insertions, 24 deletions

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
index 70546aa04..fb78d3467 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
@@ -8,11 +8,11 @@
 ---
 classes:
   - cluster.baremetal-mcp-ocata-common.openstack_compute
+  - cluster.baremetal-mcp-ocata-odl-ha.openstack.compute_init
   - cluster.baremetal-mcp-ocata-odl-ha.infra
   - system.neutron.gateway.opendaylight.single
 parameters:
   _param:
-    tenant_nic: ${_param:opnfv_baremetal_secondary_nic}
     neutron_agents:
       - neutron-dhcp-agent
       - neutron-metadata-agent
@@ -29,26 +29,3 @@ parameters:
       services: ${_param:neutron_agents}
       backend:
         router: ${_param:opendaylight_router}
-  linux:
-    network:
-      interface:
-        tenant_nic:
-          enabled: true
-          type: eth
-          proto: manual
-          name: ${_param:tenant_nic}
-        br-mesh:
-          enabled: true
-          type: bridge
-          address: ${_param:tenant_address}
-          netmask: 255.255.255.0
-          mtu: 1500
-          use_interfaces:
-            - ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan}
-        tenant-vlan:
-          enabled: true
-          proto: manual
-          type: vlan
-          name: ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan}
-          use_interfaces:
-            - ${_param:tenant_nic}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute_init.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute_init.yml.j2
new file mode 100644
index 000000000..7809bd8c8
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute_init.yml.j2
@@ -0,0 +1,79 @@
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+{# NOTE: br-{mgmt,ctl} are cross-referenced, careful when changing names #}
+{%- if conf.net_config is defined and conf.idf is defined -%}
+    {#- NOTE: Currently, we assume all cluster nodes use the same mapping -#}
+
+    {#- Determine interface index for each network (plumbing vars) -#}
+    {%- set idx_admin = conf['net_config']['admin']['interface'] -%}
+    {%- set idx_mgmt = conf['net_config']['mgmt']['interface'] -%}
+    {%- set idx_private = conf['net_config']['private']['interface'] -%}
+    {%- set idx_public = conf['net_config']['public']['interface'] -%}
+
+    {#- Physical interface OS name for each network (e.g. em1, enp1s0f1) -#}
+    {%- set node = conf['idf']['fuel']['network']['node'][1] -%}
+    {%- set nic_admin = node['interfaces'][idx_admin] -%}
+    {%- set nic_mgmt = node['interfaces'][idx_mgmt] -%}
+    {%- set nic_private = node['interfaces'][idx_private] -%}
+    {%- set nic_public = node['interfaces'][idx_public] -%}
+
+    {#- PCI addresses (only for DPDK on private) -#}
+    {%- set bus_private = node['busaddr'][idx_private] -%}
+
+    {#- VLAN for each network (only untagged 'admin' is supported by MaaS config!) -#}
+    {%- set vlan_admin = conf['net_config']['admin']['vlan'] -%}
+    {%- set vlan_mgmt = conf['net_config']['mgmt']['vlan'] -%}
+    {%- set vlan_private = conf['net_config']['private']['vlan'] -%}
+    {%- set vlan_public = conf['net_config']['public']['vlan'] -%}
+{%- else -%}
+    {%- set nic_admin = 'enp6s0' -%}
+    {%- set nic_mgmt = 'enp6s0' -%}
+    {%- set nic_private = None -%}
+    {%- set nic_public = None -%}
+    {%- set vlan_admin = 'native' -%}
+    {%- set vlan_mgmt = '300' -%}
+    {%- set vlan_private = '1000' -%}
+{%- endif -%}
+
+{#- Filter-out NIC duplicates by constructing a dict (used NICs only) -#}
+{%- set nics = { nic_private: True } -%}
+
+{%- set vlans = { vlan_private: nic_private } -%}
+---
+parameters:
+  linux:
+    network:
+      interface:
+{%- for nic in nics %}
+        {{ nic }}:
+          enabled: true
+          type: eth
+          proto: manual
+          name: {{ nic }}
+{%- endfor %}
+
+{%- for vlan in vlans %}
+    {%- if vlan and vlan != 'native' %}
+        {{ vlans[vlan] }}.{{ vlan }}:
+          enabled: true
+          proto: manual
+          type: vlan
+          name: {{ vlans[vlan] }}.{{ vlan }}
+          use_interfaces:
+            - {{ vlans[vlan] }}
+    {%- endif %}
+{%- endfor %}
+
+        br-mesh:
+          enabled: true
+          type: bridge
+          address: ${_param:tenant_address}
+          netmask: 255.255.255.0
+          mtu: 1500
+          use_interfaces:
+            - {{ nic_private }}{% if vlan_private and vlan_private != 'native' %}.{{ vlan_private }}{% endif %}