diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-13 18:33:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-13 18:33:29 +0000 |
| commit | b02aedb174bb8f5b10dc4d57d1ac36e7f1c24bb0 (patch) | |
| tree | b512a86d1cb61b63c8094a89a3cd84b90d139009 | |
| parent | f1a0561367d8e687200278ba0bdfee959aae6b6a (diff) | |
| parent | d7738012e13668e992c8d35cdd23e8527305a88e (diff) | |
Merge "Added OvS permission workaround for enabling DPDK"
| -rw-r--r-- | extraconfig/pre_network/host_config_and_reboot.yaml | 26 | ||||
| -rw-r--r-- | releasenotes/notes/ovs-dpdk-permission-workaround-20aaebcc8d6009ec.yaml | 6 |
2 files changed, 32 insertions, 0 deletions
diff --git a/extraconfig/pre_network/host_config_and_reboot.yaml b/extraconfig/pre_network/host_config_and_reboot.yaml index 6c46133a..31d0c1e0 100644 --- a/extraconfig/pre_network/host_config_and_reboot.yaml +++ b/extraconfig/pre_network/host_config_and_reboot.yaml @@ -193,6 +193,32 @@ resources: template: | #!/bin/bash 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 + + # DO NOT use --detailed-exitcodes puppet apply --logdest console \ --modulepath /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules \ diff --git a/releasenotes/notes/ovs-dpdk-permission-workaround-20aaebcc8d6009ec.yaml b/releasenotes/notes/ovs-dpdk-permission-workaround-20aaebcc8d6009ec.yaml new file mode 100644 index 00000000..f8c06fd6 --- /dev/null +++ b/releasenotes/notes/ovs-dpdk-permission-workaround-20aaebcc8d6009ec.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - Fixed the openvswitch permission to allow ovs to access vhost + sockets created by qemu. This is a workaround until openvswitch + provides the actual solution. + |