aboutsummaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-12-19 15:35:35 +0400
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-19 19:23:17 +0100
commit5ed31a007826052a723cb573f7ed49a7473699f6 (patch)
treeee634a27d394ca4e7e3728224114465bd24737e2 /mcp
parentfbf520aa48b44b4b6cec070cc46fca007a41661a (diff)
[dpdk] Remove user/group setting for ovs rundir
The proper patches have been merged into upstream (nova/neutron formulas, system reclass) to use a separate dir for vhost_user sockets. Change-Id: Iba8d8a9a05c5ab681b5b5ffbea786dca92704c82 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp')
-rwxr-xr-xmcp/config/states/dpdk3
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml1
2 files changed, 1 insertions, 3 deletions
diff --git a/mcp/config/states/dpdk b/mcp/config/states/dpdk
index 6aa2b488c..653ffc0ed 100755
--- a/mcp/config/states/dpdk
+++ b/mcp/config/states/dpdk
@@ -18,6 +18,3 @@ wait_for 90 "! salt -I 'nova:compute' test.ping | " \
salt -I 'nova:compute' alternatives.set ovs-vswitchd /usr/lib/openvswitch-switch-dpdk/ovs-vswitchd-dpdk
salt -I 'nova:compute' service.restart openvswitch-switch
-
-salt -I 'nova:compute' pkg.install libvirt-bin
-salt -I 'nova:compute' file.chown /var/run/openvswitch libvirt-qemu kvm
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
index d643da616..cfe92020d 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
@@ -14,6 +14,7 @@ parameters:
neutron:
gateway:
dpdk: 'True'
+ vhost_socket_dir: ${_param:compute_ovs_vhost_socket_dir}
backend:
tenant_vlan_range: ${_param:neutron_tenant_vlan_range}
nova: