Merge ~slashd/ubuntu/+source/ceph:eoanlp1840347 into ~ubuntu-server-dev/ubuntu/+source/ceph:ubuntu/eoan

[Eric Desrochers]

[Eric Desrochers (slashd)]

I can't delete Reviewer, so I added myself to workaround the issue.
I'll leave the reviewal to coreycb and james-pages.

Thanks

review: Abstain

diff --git a/debian/changelog b/debian/changelog
index c87bf0d..25b76a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ceph (14.2.1-0ubuntu4) eoan; urgency=medium
+
+  * d/rules: (LP: #1840347)
+    - "--no-restart-on-upgrade" is deprecated. Moving to alias
+      "--no-stop-on-upgrade" to also avoid confusion.
+    - Adding "--no-restart-after-upgrade" along with "--no-stop-on-upgrade".
+    - Dropping exclusion for ceph-[osd,mon,mds] using dh -X.
+
+ -- Eric Desrochers <[e-mail]>  Tue, 20 Aug 2019 20:17:07 -0400
+
 ceph (14.2.1-0ubuntu3) eoan; urgency=medium
 
   * d/p/pybind-auto-encode-decode-cstr.patch: Drop, reverted upstream.
diff --git a/debian/rules b/debian/rules
index 7d47a8e..85b6771 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,7 +87,7 @@ override_dh_installinit:
 	# Enable systemd targets only
 	dh_systemd_enable -Xceph-mon.service -Xceph-osd.service -X ceph-mds.service
 	# Start systemd targets only
-	dh_systemd_start --no-restart-on-upgrade -Xceph-mon.service -Xceph-osd.service -X ceph-mds.service
+	dh_systemd_start --no-stop-on-upgrade --no-restart-after-upgrade
 
 override_dh_systemd_enable:
 	# systemd enable done as part of dh_installinit