From 0c05f52aaf024db6443336f69ebc7c6e037d06b9 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Wed, 23 Jan 2019 15:36:57 +0400 Subject: Update openvswitch to 2.10 Change-Id: I0121b3190869528e5f2e9985f9e9299ac6c6724e Signed-off-by: Michael Polenchuk --- mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 | 5 +++++ mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 | 2 ++ 2 files changed, 7 insertions(+) (limited to 'mcp/reclass/classes/cluster/mcp-odl-noha') 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 3e912c1e3..5d8d26a1a 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 @@ -21,6 +21,7 @@ classes: parameters: linux: network: + ovs_nowait: false interface: {%- if '-ovs-' in conf.MCP_DEPLOY_SCENARIO %} dpdk0: @@ -48,11 +49,15 @@ parameters: br-floating: enabled: true type: ovs_bridge + datapath_type: netdev + use_interfaces: + - float-to-ex float-to-ex: enabled: true type: ovs_port mtu: ${_param:interface_mtu} bridge: br-floating + ovs_bridge: br-floating noifupdown: true br-ex: enabled: true diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 index 58ba34f56..c7272ffe8 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 @@ -27,6 +27,8 @@ parameters: proto: static address: ${_param:tenant_address} netmask: ${_param:opnfv_net_private_mask} + use_interfaces: + - {{ nm.ctl01.nic_private }} {%- else %} br-mesh: enabled: true -- cgit 1.2.3-korg