diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-27 23:59:50 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-02-05 06:03:35 +0100 |
| commit | cefce150621699e9d9d3ac5c884a28ee4766c24d (patch) | |
| tree | 4d8a2fab067a179323328083e0ec4f0c54f6be4f /mcp/reclass/classes/cluster/all-mcp-arch-common/infra | |
| parent | 342b6bad34e8c949aa81adf711e6a357e56942d3 (diff) | |
[virtual] PDF-based network defs for cluster nodes
Decouple virtual cluster nodes (ctl, gtw etc.) from opnfv_fn_* vars
in favor of parsing PDF/IDF.
This is the first step towards unifying baremetal and virtual network
definition templates, as well as allowing virtual nodes to run on a
remote hypervisor (and eventually with a different arch).
opnfv_fn_* vars will still be used for infra VMs spawned on FN (cfg01
and optionally mas01).
Adopt new 'net_map.j2' from Pharos submodule for new templates (virt),
as well as old ones (baremetal).
JIRA: FUEL-322
Change-Id: I150c2416566bbe42ea11cd00f12a8a7bf96776c2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/all-mcp-arch-common/infra')
| -rw-r--r-- | mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_dpdk_pdf.yml.j2 | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_dpdk_pdf.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_dpdk_pdf.yml.j2 index 062e8a4fa..54b2b5504 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_dpdk_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_dpdk_pdf.yml.j2 @@ -5,19 +5,7 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -{%- if conf.idf is defined and conf.idf.net_config is defined -%} - {#- NOTE: Currently, we assume all cluster nodes use the same mapping -#} - - {#- Determine interface index for each network (plumbing vars) -#} - {%- set idx_private = conf['idf']['net_config']['private']['interface'] -%} - - {#- Physical interface OS name for each network (e.g. em1, enp1s0f1) -#} - {%- set node = conf['idf']['fuel']['network']['node'][0] -%} - {%- set nic_private = node['interfaces'][idx_private] -%} - - {#- PCI addresses (only for DPDK on private) -#} - {%- set bus_private = node['busaddr'][idx_private] -%} -{%- endif -%} +{%- import 'net_map.j2' as nm with context %} --- parameters: reclass: @@ -25,9 +13,9 @@ parameters: node: openstack_compute_node01: params: - dpdk0_name: {{ nic_private }} - dpdk0_pci: '"{{ bus_private }}"' + dpdk0_name: {{ nm.cmp001.nic_private }} + dpdk0_pci: '"{{ nm.cmp001.bus_private }}"' openstack_compute_node02: params: - dpdk0_name: {{ nic_private }} - dpdk0_pci: '"{{ bus_private }}"' + dpdk0_name: {{ nm.cmp001.nic_private }} + dpdk0_pci: '"{{ nm.cmp001.bus_private }}"' |