diff options
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2 | 6 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2 index fa061fda6..cf9a0b302 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2 @@ -10,6 +10,7 @@ parameters: linux: network: + ovs_nowait: true interface: dpdk0: name: ${_param:dpdk0_name} @@ -22,10 +23,5 @@ parameters: br-prv: enabled: true type: dpdk_ovs_bridge - address: ${_param:tenant_address} - netmask: 255.255.255.0 - {%- if nm.vlan_private | int > 0 %} - tag: {{ nm.vlan_private }} - {%- endif %} br-floating: datapath_type: netdev diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml index 1800a58af..55fc6ab5c 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml @@ -10,5 +10,5 @@ classes: - cluster.mcp-pike-common-ha.openstack_init parameters: _param: - neutron_tenant_network_types: "flat,vxlan" + neutron_tenant_network_types: "flat,vlan" neutron_tenant_vlan_range: "1000:1030" |