summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/reclass/classes')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml.j2 (renamed from mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml)15
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/init.yml2
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/compute.yml5
3 files changed, 11 insertions, 11 deletions
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
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/compute.yml
index 819fa5efa..c59cdaade 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/compute.yml
@@ -19,11 +19,6 @@ parameters:
tenant_network_types: ${_param:neutron_tenant_network_types}
linux:
network:
- dpdk_pkgs:
- - dpdk
- - dpdk-dev
- - dpdk-igb-uio-dkms
- - dpdk-rte-kni-dkms
interface:
dpdk0:
name: ${_param:dpdk0_name}