Merge ~mfo/ubuntu/+source/cinder:lp1987663-noble into ~ubuntu-openstack-dev/ubuntu/+source/cinder:master

[Mauricio Faria de Oliveira]

Hi Corey,

This fixes cinder-volume.service/Wants=tgt.service for Noble.

Per your request in Mantic MR [1] it uses openstack-pkg-tools
123ubuntu2, which emits Wants= for Should-Start: as well.

Could you please review and upload to Noble?
(I can only uploads to stable releases for now.)

The changes work as expected in a test package:

    $ sudo apt build-dep -y cinder
    $ dpkg -s openstack-pkg-tools | grep Version:
    Version: 123ubuntu2

    $ dpkg-source -x cinder_23.0.0-0ubuntu2.dsc
    $ cd cinder-*
    $ DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -b -uc

    $ dpkg-deb -x ../cinder-volume_23.0.0-0ubuntu2_all.deb /tmp/cinder-volume-deb
    $ fgrep tgt.service /tmp/cinder-volume-deb/lib/systemd/system/cinder-volume.service
    After=... tgt.service ...
    Wants=... tgt.service ...

Thanks,
Mauricio

[1] https://code.launchpad.net/~mfo/ubuntu/+source/cinder/+git/cinder/+merge/454428/comments/1218839
[2] https://launchpad.net/ubuntu/+source/openstack-pkg-tools/123ubuntu2

[Corey Bryant (corey.bryant)]

Merged, thanks! I did make a small update to d/control to make sure the min version of openstack-pkg-tools is the fixed version. This is less important for noble, and more important for when it gets backported to the jammy-based cloud-archive.

diff --git a/debian/changelog b/debian/changelog
index d456fff..7f2a25b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
-cinder (2:23.0.0-0ubuntu2) UNRELEASED; urgency=medium
+cinder (2:23.0.0-0ubuntu2) noble; urgency=medium
 
+  [ Corey Bryant ]
   * d/gbp.conf, .launchpad.yaml: Sync from cloud-archive-tools for
     caracal.
 
- -- Corey Bryant <[e-mail]>  Tue, 24 Oct 2023 16:17:55 -0400
+  [ Mauricio Faria de Oliveira ]
+  * d/cinder-volume.init.in: add tgt to Should-Start/Stop (LP: #1987663)
+    Requires rebuild to pick up openstack-pkg-tools 123ubuntu2 in noble.
+
+ -- Mauricio Faria de Oliveira <[e-mail]>  Fri, 10 Nov 2023 13:10:45 -0300
 
 cinder (2:23.0.0-0ubuntu1) mantic; urgency=medium
 
diff --git a/debian/cinder-volume.init.in b/debian/cinder-volume.init.in
index 15193ef..0e3d117 100644
--- a/debian/cinder-volume.init.in
+++ b/debian/cinder-volume.init.in
@@ -3,8 +3,8 @@
 # Provides:          cinder-volume
 # Required-Start:    $network $local_fs $remote_fs $syslog
 # Required-Stop:     $remote_fs
-# Should-Start:      postgresql mysql keystone rabbitmq-server ntp
-# Should-Stop:       postgresql mysql keystone rabbitmq-server ntp
+# Should-Start:      postgresql mysql keystone rabbitmq-server ntp tgt
+# Should-Stop:       postgresql mysql keystone rabbitmq-server ntp tgt
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Cinder Volume