Skip to content

Commit

Permalink
Fixes systemd ovs check for ovn/sdn
Browse files Browse the repository at this point in the history
There is a period of time where MCO will lay down the files for 4.6
before it reboots the node into the new OS. If the ovs pods are coming
up at this time they could accidentally think systemd ovs is running,
which it is not. This patch modifies the check to look in systemd, where
the ovs-configuration service will be enabled only when 4.6 is booted.

Signed-off-by: Tim Rozet <trozet@redhat.com>
  • Loading branch information
trozet committed Oct 1, 2020
1 parent fe416a3 commit ac28599
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion bindata/network/openshift-sdn/sdn-ovs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ spec:
echo "${1//-/_2d}"
}
# Check to see if ovs is provided by the node:
if [[ -f '/host/usr/local/bin/configure-ovs.sh' ]]; then
if [[ -f '/host/etc/systemd/system/network-online.target.wants/ovs-configuration.service' ]]; 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/006-ovs-node.yaml
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 [[ -f '/host/usr/local/bin/configure-ovs.sh' ]]; then
if [[ -f '/host/etc/systemd/system/network-online.target.wants/ovs-configuration.service' ]]; 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

0 comments on commit ac28599

Please sign in to comment.