Skip to content

Bug 1880591: 4.6 Use ovs-configuration file to determine if OVS is running in systemd #825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Oct 8, 2020
Merged

Bug 1880591: 4.6 Use ovs-configuration file to determine if OVS is running in systemd #825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions bindata/network/openshift-sdn/sdn-ovs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ spec:
}

# Check to see if ovs is provided by the node:
if [[ -L '/host/etc/systemd/system/network-online.target.wants/ovs-configuration.service' ]]; then
Copy link
Contributor

@rbbratta rbbratta Oct 6, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, just found a vSphere node with

/etc/systemd/system/multi-user.target.wants/ovs-configuration.service -> /etc/systemd/system/ovs-configuration.service

Copy link
Contributor Author

@trozet trozet Oct 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah its an MCO bug: https://bugzilla.redhat.com/show_bug.cgi?id=1885365

if [ -f /host/var/run/ovs-config-executed ]; then
Copy link

@vrutkovs vrutkovs Oct 10, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does this file gets generated? I don't see it being created by MCO

Copy link
Contributor

@rbbratta rbbratta Oct 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

openshift/machine-config-operator#2140

only in release-4.6 branch
https://github.com/openshift/machine-config-operator/blob/release-4.6/templates/common/_base/files/configure-ovs-network.yaml#L9

in 4.7 we should only run host OVS, so I think the plan is to remove this if.

echo "openvswitch is running in systemd"
# In some very strange corner cases, the owner for /run/openvswitch
# can be wrong, so we need to clean up and restart.
Expand All @@ -65,7 +65,6 @@ spec:
# Don't need to worry about restoring flows; this can only change if we've rebooted
exec tail -F /host/var/log/openvswitch/ovs-vswitchd.log /host/var/log/openvswitch/ovsdb-server.log
else

echo "openvswitch is running in container"
# if another process is listening on the cni-server socket, wait until it exits
retries=0
Expand Down
2 changes: 1 addition & 1 deletion bindata/network/ovn-kubernetes/006-ovs-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ spec:
}

# Check to see if ovs is provided by the node:
if [[ -L '/host/etc/systemd/system/network-online.target.wants/ovs-configuration.service' ]]; then
if [ -f /host/var/run/ovs-config-executed ]; then
echo "openvswitch is running in systemd"
# In some very strange corner cases, the owner for /run/openvswitch
# can be wrong, so we need to clean up and restart.
Expand Down
2 changes: 1 addition & 1 deletion bindata/network/ovn-kubernetes/ovnkube-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ spec:
gateway_mode_flags=
# Check to see if ovs is provided by the node. This is only for upgrade from 4.5->4.6 or
# openshift-sdn to ovn-kube conversion
if grep -q OVNKubernetes /etc/systemd/system/ovs-configuration.service ; then
if grep -q OVNKubernetes /etc/systemd/system/ovs-configuration.service && [ -f /host/var/run/ovs-config-executed ]; then
Copy link
Contributor

@danwinship danwinship Oct 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

first half of this is unnecessary now isn't it?

Copy link
Contributor Author

@trozet trozet Oct 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's still necessary for SDN conversion I think

gateway_mode_flags="--gateway-mode local --gateway-interface br-ex"
else
gateway_mode_flags="--gateway-mode local --gateway-interface none"
Expand Down