diff options
author | Timothy Redaelli <tredaelli@redhat.com> | 2017-12-22 16:00:52 +0100 |
---|---|---|
committer | Ben Pfaff <blp@ovn.org> | 2018-01-08 10:39:36 -0800 |
commit | d922ebc876afb89729e5e582cc4642e3ae8d4799 (patch) | |
tree | 7c800d73d09652cf5ccf482cb6d0d9311b60f8a0 | |
parent | 361094346d942deb01ff198980fff95ecf01533b (diff) | |
download | openvswitch-d922ebc876afb89729e5e582cc4642e3ae8d4799.tar.gz |
rhel: use the functions in ovs-lib.in in ovs-systemd-reload
To avoid code duplication use the functions from ovs-lib.in
Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Tested-by: Greg Rose <gvrose8192@gmail.com>
Reviewed-by: Greg Rose <gvrose8192@gmail.com>
-rwxr-xr-x | rhel/usr_share_openvswitch_scripts_ovs-systemd-reload | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/rhel/usr_share_openvswitch_scripts_ovs-systemd-reload b/rhel/usr_share_openvswitch_scripts_ovs-systemd-reload index 3ac1a46c6..5d2efc621 100755 --- a/rhel/usr_share_openvswitch_scripts_ovs-systemd-reload +++ b/rhel/usr_share_openvswitch_scripts_ovs-systemd-reload @@ -14,23 +14,32 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Save flows -bridges=$(ovs-vsctl -- --real list-br) -flows=$(/usr/share/openvswitch/scripts/ovs-save save-flows $bridges) +case $0 in + */*) dir0=`echo "$0" | sed 's,/[^/]*$,,'` ;; + *) dir0=./ ;; +esac +. "$dir0/ovs-lib" || exit 1 -# Restart the database first, since a large database may take a -# while to load, and we want to minimize forwarding disruption. -systemctl --job-mode=ignore-dependencies restart ovsdb-server +stop_ovsdb() { + systemctl --job-mode=ignore-dependencies stop ovsdb-server +} -# Stop ovs-vswitchd. -systemctl --job-mode=ignore-dependencies stop ovs-vswitchd +start_ovsdb() { + systemctl --job-mode=ignore-dependencies start ovsdb-server +} -# Start vswitchd by asking it to wait till flow restore is finished. -ovs-vsctl --no-wait set open_vswitch . other_config:flow-restore-wait=true -systemctl --job-mode=ignore-dependencies start ovs-vswitchd +stop_forwarding() { + systemctl --job-mode=ignore-dependencies stop ovs-vswitchd +} -# Restore saved flows and inform vswitchd that we are done. -eval "$flows" -ovs-vsctl --if-exists remove open_vswitch . other_config flow-restore-wait=true +start_forwarding() { + systemctl --job-mode=ignore-dependencies start ovs-vswitchd +} + +add_managers() { + : +} + +restart exit 0 |