diff -Nru glusterfs-3.13.2/debian/changelog glusterfs-3.13.2/debian/changelog
--- glusterfs-3.13.2/debian/changelog	2018-02-05 20:39:53.000000000 +0000
+++ glusterfs-3.13.2/debian/changelog	2019-06-07 17:15:05.000000000 +0000
@@ -1,8 +1,19 @@
-glusterfs (3.13.2-1build1~cloud0) xenial-queens; urgency=medium
+glusterfs (3.13.2-1ubuntu1~cloud1) xenial-queens; urgency=medium
 
   * New update for the Ubuntu Cloud Archive.
 
- -- Openstack Ubuntu Testing Bot <openstack-testing-bot@ubuntu.com>  Mon, 05 Feb 2018 20:39:52 +0000
+ -- Openstack Ubuntu Testing Bot <openstack-testing-bot@ubuntu.com>  Fri, 07 Jun 2019 17:15:05 +0000
+
+glusterfs (3.13.2-1ubuntu1) bionic; urgency=medium
+
+  * debian/rules: Drop init script in favor of systemd unit.
+    This also prevent the package to break during the installation
+    and end up in half-configured state. (LP: #1830615)
+
+  * debian/glusterfs-server.maintscript:
+    - Remove obsolete conffile
+
+ -- Eric Desrochers <eric.desrochers@canonical.com>  Fri, 31 May 2019 16:14:29 -0400
 
 glusterfs (3.13.2-1build1) bionic; urgency=high
 
diff -Nru glusterfs-3.13.2/debian/glusterfs-server.maintscript glusterfs-3.13.2/debian/glusterfs-server.maintscript
--- glusterfs-3.13.2/debian/glusterfs-server.maintscript	2018-01-24 14:12:38.000000000 +0000
+++ glusterfs-3.13.2/debian/glusterfs-server.maintscript	2019-05-31 20:14:29.000000000 +0000
@@ -1 +1,3 @@
 rm_conffile /etc/init.d/glusterfs-server 3.10.1-2
+rm_conffile /etc/init.d/glusterd 3.13.2-1
+rm_conffile /etc/init.d/glustereventsd 3.13.2-1
diff -Nru glusterfs-3.13.2/debian/rules glusterfs-3.13.2/debian/rules
--- glusterfs-3.13.2/debian/rules	2018-01-24 14:12:38.000000000 +0000
+++ glusterfs-3.13.2/debian/rules	2019-05-31 20:12:39.000000000 +0000
@@ -8,7 +8,9 @@
 	dh $@ --parallel --with python2 --with autotools-dev --with systemd
 
 override_dh_install:
-	cp extras/run-gluster.tmpfiles.in $(CURDIR)/debian/glusterfs-server.tmpfile
+	cp extras/run-gluster.tmpfiles $(CURDIR)/debian/glusterfs-server.tmpfile
+	cp extras/systemd/glusterd.service $(CURDIR)/debian/glusterfs-server.glusterd.service
+	cp extras/systemd/glustereventsd.service $(CURDIR)/debian/glusterfs-server.glustereventsd.service
 	strip --remove-section=.comment --remove-section=.note --strip-unneeded \
 		debian/tmp/usr/lib/*/glusterfs/*/xlator/debug/trace.so
 	strip --remove-section=.comment --remove-section=.note --strip-unneeded \
@@ -24,6 +26,10 @@
 	mv $(CURDIR)/debian/glusterfs-common/usr/share/glusterfs/scripts/gsync-sync-gfid \
 		$(CURDIR)/debian/glusterfs-common/usr/lib/$(DEB_HOST_MULTIARCH)/glusterfs/gsync-sync-gfid
 
+override_dh_systemd_enable:
+	dh_systemd_enable --no-enable --name=glusterd
+	dh_systemd_enable --no-enable --name=glustereventsd
+
 override_dh_link:
 	dh_link
 	dh_link -pglusterfs-common \
@@ -37,11 +43,5 @@
 	dh_python2 usr/lib/$(DEB_HOST_MULTIARCH)/glusterfs/events/
 	dh_python2 usr/lib/python2.7/dist-packages/gluster/
 
-override_dh_installinit:
-	cp $(CURDIR)/debian/tmp/etc/init.d/glusterd $(CURDIR)/debian/glusterfs-server.glusterd.init
-	cp $(CURDIR)/debian/tmp/etc/init.d/glustereventsd $(CURDIR)/debian/glusterfs-server.glustereventsd.init
-	dh_installinit -p glusterfs-server --name=glusterd
-	dh_installinit -p glusterfs-server --name=glustereventsd
-
 override_dh_makeshlibs:
 	dh_makeshlibs --no-scripts