From b7a70f56138b69837d26d27cdc1c62bf10e8fa21 Mon Sep 17 00:00:00 2001 From: Saravanan KR Date: Wed, 29 Nov 2017 17:47:03 +0530 Subject: [PATCH] Removed ovs-dpdk workaround to fix the vhost socket permission Change-Id: I5d8e31020700f13e21f4cfa2f1bfa14ff4c88e4a --- .../pre_network/host_config_and_reboot.yaml | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/extraconfig/pre_network/host_config_and_reboot.yaml b/extraconfig/pre_network/host_config_and_reboot.yaml index d13145c41a..b96b6fe21a 100644 --- a/extraconfig/pre_network/host_config_and_reboot.yaml +++ b/extraconfig/pre_network/host_config_and_reboot.yaml @@ -283,33 +283,6 @@ resources: #!/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 - - systemctl daemon-reload - systemctl restart openvswitch - # DO NOT use --detailed-exitcodes puppet apply --logdest console --summarize \ --modulepath /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules \