openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Removed ovs-dpdk workaround to fix the vhost socket permission"

This commit is contained in:
Zuul 2018-02-27 12:12:55 +00:00 committed by Gerrit Code Review
parent 6222a0ab81 b7a70f5613
commit e0f59eefd2
1 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
extraconfig/pre_network/host_config_and_reboot.yaml
View File

@ -311,33 +311,6 @@ resources:
#!/bin/bash #!/bin/bash
set -x set -x
# OvS Permission issue temporary workaround
# https://bugzilla.redhat.com/show_bug.cgi?id=1459436
# Actual solution from openvswitch - https://mail.openvswitch.org/pipermail/ovs-dev/2017-June/333423.html
ovs_service_path="/usr/lib/systemd/system/ovs-vswitchd.service"
if grep -q 'RuntimeDirectoryMode' $ovs_service_path; then
sed -i 's/RuntimeDirectoryMode=.*/RuntimeDirectoryMode=0775/' $ovs_service_path
else
echo "RuntimeDirectoryMode=0775" >> $ovs_service_path
fi
if ! grep -Fxq "Group=qemu" $ovs_service_path ; then
echo "Group=qemu" >> $ovs_service_path
fi
if ! grep -Fxq "UMask=0002" $ovs_service_path ; then
echo "UMask=0002" >> $ovs_service_path
fi
ovs_ctl_path='/usr/share/openvswitch/scripts/ovs-ctl'
if ! grep -q "umask 0002 \&\& start_daemon \"\$OVS_VSWITCHD_PRIORITY\"" $ovs_ctl_path ; then
sed -i 's/start_daemon \"\$OVS_VSWITCHD_PRIORITY\"/umask 0002 \&\& start_daemon \"$OVS_VSWITCHD_PRIORITY\"/' $ovs_ctl_path
fi
systemctl daemon-reload
systemctl restart openvswitch
# DO NOT use --detailed-exitcodes # DO NOT use --detailed-exitcodes
puppet apply --logdest console --summarize \ puppet apply --logdest console --summarize \
--modulepath /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules \ --modulepath /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules \