Skip to content

Bug 1796718: ovn: use ovs-appctl ovsdb-server/sync-status for NB/SB DB readiness #461

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
Jan 31, 2020
Merged

Bug 1796718: ovn: use ovs-appctl ovsdb-server/sync-status for NB/SB DB readiness #461

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
38 changes: 34 additions & 4 deletions bindata/network/ovn-kubernetes/ovnkube-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,23 @@ spec:
fi
readinessProbe:
initialDelaySeconds: 30
tcpSocket:
port: {{.OVN_NB_PORT}}
exec:
command:
- /bin/bash
- -c
- |
set -xe
# Determine the ovn rundir.
if [[ -f /usr/bin/ovn-appctl ]] ; then
# ovn-appctl is present. Use new ovn run dir path.
DB_SOCK_PATH=/var/run/ovn/ovnnb_db.ctl
APPCTL_PATH=/usr/bin/ovn-appctl
else
# ovn-appctl is not present. Use openvswitch run dir path.
DB_SOCK_PATH=/var/run/openvswitch/ovnnb_db.ctl
APPCTL_PATH=/usr/bin/ovs-appctl
fi
exec ${APPCTL_PATH} -t ${DB_SOCK_PATH} ovsdb-server/sync-status
env:
- name: OVN_LOG_LEVEL
value: info
Expand Down Expand Up @@ -276,8 +291,23 @@ spec:
fi
readinessProbe:
initialDelaySeconds: 30
tcpSocket:
port: {{.OVN_SB_PORT}}
exec:
command:
- /bin/bash
- -c
- |
set -xe
# Determine the ovn rundir.
if [[ -f /usr/bin/ovn-appctl ]] ; then
# ovn-appctl is present. Use new ovn run dir path.
DB_SOCK_PATH=/var/run/ovn/ovnsb_db.ctl
APPCTL_PATH=/usr/bin/ovn-appctl
else
# ovn-appctl is not present. Use openvswitch run dir path.
DB_SOCK_PATH=/var/run/openvswitch/ovnsb_db.ctl
APPCTL_PATH=/usr/bin/ovs-appctl
fi
exec ${APPCTL_PATH} -t ${DB_SOCK_PATH} ovsdb-server/sync-status
env:
- name: OVN_LOG_LEVEL
value: info
Expand Down