openstack/devstack
Code Issues Proposed changes

Merge "Start OVS as root on Tumblweed to workaround bsc#1085971"

Browse Source
This commit is contained in:
Zuul 2018-04-13 11:13:18 +00:00 committed by Gerrit Code Review
commit 0f6ecb7ae4
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/neutron_plugins/ovs_base
View File

@ -72,7 +72,14 @@ function _neutron_ovs_base_install_agent_packages {
if [[ $DISTRO == "sle12" ]] && [[ $os_RELEASE -lt 12.2 ]]; then if [[ $DISTRO == "sle12" ]] && [[ $os_RELEASE -lt 12.2 ]]; then
restart_service openvswitch-switch restart_service openvswitch-switch
else else
restart_service openvswitch # workaround for https://bugzilla.suse.com/show_bug.cgi?id=1085971
if [[ $DISTRO =~ "tumbleweed" ]]; then
sudo sed -i -e "s,^OVS_USER_ID=.*,OVS_USER_ID='root:root'," /etc/sysconfig/openvswitch
fi
restart_service openvswitch || {
journalctl -xe || :
systemctl status openvswitch
}
fi fi
fi fi
} }