summaryrefslogtreecommitdiffstats
path: root/mcp/config/states
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/config/states')
-rwxr-xr-xmcp/config/states/dpdk3
-rwxr-xr-xmcp/config/states/networks3
2 files changed, 3 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