Merge ~slashd/ubuntu/+source/ceph:bioniclp1840347 into ~ubuntu-server-dev/ubuntu/+source/ceph:ubuntu/bionic

[Eric Desrochers]

diff --git a/debian/changelog b/debian/changelog
index efdf605..40ad65c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ceph (12.2.12-0ubuntu0.18.04.2) UNRELEASED; urgency=medium
+ceph (12.2.12-0ubuntu0.18.04.2) bionic; urgency=medium
 
   [ James Page ]
   * d/p/ceph-volume-wait-for-lvs.patch: Cherry pick inflight fix to
@@ -10,6 +10,13 @@ ceph (12.2.12-0ubuntu0.18.04.2) UNRELEASED; urgency=medium
     to civetweb to allow tuning of SOMAXCONN in Ceph RADOS Gateway
     deployments (LP: #1838109).
 
+  [ Eric Desrochers ]
+  * 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.
+
  -- James Page <[e-mail]>  Wed, 03 Jul 2019 12:38:47 +0100
 
 ceph (12.2.12-0ubuntu0.18.04.1) bionic; urgency=medium
diff --git a/debian/rules b/debian/rules
index 154534b..1446fe5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -132,7 +132,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