From cefce150621699e9d9d3ac5c884a28ee4766c24d Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 27 Jan 2018 23:59:50 +0100 Subject: [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 --- .../openstack/compute_pdf.yml.j2 | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha') diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2 index faa4558f0..475f3a0fa 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2 @@ -5,11 +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 -%} - {%- set vlan_private = conf['idf']['net_config']['private']['vlan'] -%} -{%- else -%} - {%- set vlan_private = '1000' -%} -{%- endif -%} +{%- import 'net_map.j2' as nm with context %} --- parameters: linux: @@ -28,6 +24,6 @@ parameters: type: dpdk_ovs_bridge address: ${_param:tenant_address} netmask: 255.255.255.0 - {%- if vlan_private and vlan_private != 'native' %} - tag: {{ vlan_private }} + {%- if nm.vlan_private and nm.vlan_private != 'native' %} + tag: {{ nm.vlan_private }} {%- endif %} -- cgit 1.2.3-korg