Merge ~fnordahl/ubuntu/+source/ovn:bug/1940043 into ~ubuntu-server-dev/ubuntu/+source/ovn:master

[Frode Nordahl]

[James Page (james-page)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 496c3dd..68f4211 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ovn (21.09.0~git20210806.d08f89e21-0ubuntu1.1) impish; urgency=medium
+
+  * Allow upgrades without data plane outage.
+    - d/ovn-host.ovn-controller.service: Pass --restart option when
+      calling `ovn-ctl stop_controller` (LP: #1940043).
+
+ -- Frode Nordahl <[e-mail]>  Mon, 16 Aug 2021 11:53:37 +0200
+
 ovn (21.09.0~git20210806.d08f89e21-0ubuntu1) impish; urgency=medium
 
   * Snapshot in preparation for 21.09 release.
diff --git a/debian/ovn-host.ovn-controller.service b/debian/ovn-host.ovn-controller.service
index a41e77d..153bce6 100644
--- a/debian/ovn-host.ovn-controller.service
+++ b/debian/ovn-host.ovn-controller.service
@@ -9,7 +9,7 @@ Type=forking
 EnvironmentFile=-/etc/default/ovn-host
 PIDFile=%t/ovn/ovn-controller.pid
 ExecStart=/usr/share/ovn/scripts/ovn-ctl start_controller --ovn-manage-ovsdb=no --no-monitor $OVN_CTL_OPTS
-ExecStop=/usr/share/ovn/scripts/ovn-ctl stop_controller --no-monitor
+ExecStop=/usr/share/ovn/scripts/ovn-ctl stop_controller --no-monitor --restart
 Restart=on-failure
 LimitNOFILE=65535
 TimeoutStopSec=15