diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-09-05 05:38:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-05 05:38:03 +0000 |
| commit | ed9d57a2314805a2e2bd65602ef67e6cc59a1918 (patch) | |
| tree | 4fd8df1bf69f87b8c8a1454e29db65a948a27b86 | |
| parent | 381d952bf505cda14088ac39f9a53229f70b8ef7 (diff) | |
| parent | e5ff32c6ceccc185e43bb4225a0db8dbd048669e (diff) | |
Merge "[noha] Set MTU on tenant/private dpdk interface"
5 files changed, 6 insertions, 3 deletions
diff --git a/mcp/config/states/dpdk b/mcp/config/states/dpdk index 281b78fed..efe1dafe5 100755 --- a/mcp/config/states/dpdk +++ b/mcp/config/states/dpdk @@ -14,3 +14,6 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" salt -I 'nova:compute' alternatives.set ovs-vswitchd /usr/lib/openvswitch-switch-dpdk/ovs-vswitchd-dpdk salt -I 'nova:compute' service.restart openvswitch-switch + +# Set datapath type to netdev for public bridge +salt -I 'nova:compute' cmd.run 'ovs-vsctl set bridge br-floating datapath_type=netdev' diff --git a/mcp/config/states/networks b/mcp/config/states/networks index e0d2aeea3..e9a9f5190 100755 --- a/mcp/config/states/networks +++ b/mcp/config/states/networks @@ -38,6 +38,3 @@ salt -C 'I@nova:controller and *01*' cmd.run ". /root/keystonercv3; \ # Discover compute hosts after they are registered salt -C 'I@nova:controller and *01*' state.sls_id nova_controller_discover_hosts nova - -# Set datapath type to netdev for public bridge -((MCP_DPDK_MODE)) && salt -I 'nova:compute' cmd.run 'ovs-vsctl set bridge br-floating datapath_type=netdev' || /bin/true diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2 index 3c7388a9c..aceb54461 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2 @@ -29,6 +29,7 @@ parameters: {%- endif %} linux: network: + ovs_nowait: true bridge: openvswitch interface: pxe_admin_int: diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 index 0ad368611..1c4ee7a19 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 @@ -31,6 +31,7 @@ parameters: bridge: br-prv type: dpdk_ovs_port n_rxq: ${_param:dpdk0_n_rxq} + mtu: ${_param:interface_mtu} br-prv: enabled: true type: dpdk_ovs_bridge diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml.j2 index df2911104..25fc82624 100644 --- a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml.j2 @@ -34,6 +34,7 @@ parameters: bridge: br-prv type: dpdk_ovs_port n_rxq: ${_param:dpdk0_n_rxq} + mtu: ${_param:interface_mtu} br-prv: enabled: true type: dpdk_ovs_bridge |