3 files changed, 20 insertions, 15 deletions

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config_pdf.yml.j2
index 5511ed774..08e8ab717 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config_pdf.yml.j2
@@ -6,14 +6,14 @@
 # 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 -%}
+{%- 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_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'] -%}
+    {%- set idx_admin = conf['idf']['net_config']['admin']['interface'] -%}
+    {%- set idx_mgmt = conf['idf']['net_config']['mgmt']['interface'] -%}
+    {%- set idx_private = conf['idf']['net_config']['private']['interface'] -%}
+    {%- set idx_public = conf['idf']['net_config']['public']['interface'] -%}
 
     {#- Physical interface OS name for each network (e.g. em1, enp1s0f1) -#}
     {%- set node = conf['idf']['fuel']['network']['node'][0] -%}
@@ -26,10 +26,10 @@
     {%- 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'] -%}
+    {%- set vlan_admin = conf['idf']['net_config']['admin']['vlan'] -%}
+    {%- set vlan_mgmt = conf['idf']['net_config']['mgmt']['vlan'] -%}
+    {%- set vlan_private = conf['idf']['net_config']['private']['vlan'] -%}
+    {%- set vlan_public = conf['idf']['net_config']['public']['vlan'] -%}
 {%- else -%}
     {%- set nic_admin = 'enp6s0' -%}
     {%- set nic_mgmt = 'enp6s0' -%}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml.j2
index cfe92020d..76fa17946 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml.j2
@@ -5,6 +5,11 @@
 # 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 -%}
 ---
 classes:
   - cluster.baremetal-mcp-pike-common-ha.openstack_compute
@@ -23,11 +28,6 @@ parameters:
       libvirt_bin: /etc/default/libvirtd
   linux:
     network:
-      dpdk_pkgs:
-        - dpdk
-        - dpdk-dev
-        - dpdk-igb-uio-dkms
-        - dpdk-rte-kni-dkms
       interface:
         dpdk0:
           name: ${_param:dpdk0_name}
@@ -40,3 +40,8 @@ parameters:
         br-prv:
           enabled: true
           type: dpdk_ovs_bridge
+          address: ${_param:tenant_address}
+          netmask: 255.255.255.0
+          {%- if vlan_private and vlan_private != 'native' %}
+          tag: {{ vlan_private }}
+          {%- endif %}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/init.yml
index 7d85fda41..49af851cc 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/init.yml
@@ -10,7 +10,7 @@ classes:
   - cluster.baremetal-mcp-pike-common-ha.openstack_init
 parameters:
   _param:
-    neutron_tenant_network_types: "flat,vlan"
+    neutron_tenant_network_types: "flat,vxlan"
     neutron_tenant_vlan_range: "1000:1030"
     nova_cpu_pinning: "5-7,13-15"
     compute_hugepages_size: 2M