Merge ~rbartzen/ubuntu/+source/ovn:systemd_fix into ubuntu/+source/ovn:ubuntu/devel

[Roberto Bartzen Acosta]

[Andreas Hasenack (ahasenack)]

Your proposal looks sane, and I see another service already does the same, as you stated in the bug:

debian/ovn-ic-db.ovn-ovsdb-server-ic-sb.service:
...
[Service]
Type=simple
EnvironmentFile=-/etc/default/ovn-ic
PIDFile=%t/ovn/ovn_ic_sb_db.pid
ExecStart=/usr/share/ovn/scripts/ovn-ctl run_ic_sb_ovsdb $OVN_CTL_OPTS

But this package is a sync in ubuntu:
 ovn | 24.03.2-2 | oracular | source
 ovn | 24.03.2-2 | unstable | source

And it's used in big projects like openstack. If we make this change in ubuntu now, that would block future automatic syncs from debian.

Would you mind creating a bug in debian, and/or perhaps an MP against the package in salsa? The MP can be filed here[1]. I don't see any existing ones there, though, so perhaps that team prefers to receive contributions via bug reports against the ovn package in debian.

To file a bug against the package in debian, basically send a clear-text email do <email address hidden> with (I prefer to use source packages as target, so "ovn" below)"

Subject: ovn: systemd service does not use ovn_ctl_opts

Body:
Package: ovn
Version: 24.03.2-2
Severity: Normal

Dear Maintainer,

<your description of the issue here, attach patch>

1. https://salsa.debian.org/openstack-team/third-party/ovn/-/merge_requests

review: Needs Information

[Roberto Bartzen Acosta (rbartzen)]

Hi Andreas,

Thanks for your feedback.

I think we are done with debian salsa merge:
https://salsa.debian.org/openstack-team/third-party/ovn/-/commit/d082e0ee08e0672d544b57110846b92f413f77c9

Do I need to take any other action?

Kind regards,
Roberto

[Lukas Märdian (slyon)]

I see the change landed in Debian and will eventually be auto-sync'ed to Ubuntu. I've rebased your branch on top of "oracular-devel" and sponsored a "~willsync1" upload, that will automatically be replaced by the Debian version, once it's uploaded there.

review: Approve

Unmerged commits

a627c68... by Roberto Bartzen Acosta on 2024-04-23

Fix ovn-ic.service systemd script

Add support to use EnvironmentFile and OVN_CTL_OPTS (LP: #2063260)

Signed-off-by: Roberto Bartzen Acosta <email address hidden>

0e3ce87... by William Grant on 2024-04-01

24.03.1-2ubuntu3 (patches unapplied)

Imported using git-ubuntu import.

ecd7f77... by Frode Nordahl <email address hidden> on 2024-03-28

24.03.1-2ubuntu2 (patches unapplied)

Imported using git-ubuntu import.

0de6d3e... by Frode Nordahl <email address hidden> on 2024-03-15

24.03.1-2ubuntu1 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/ovn-ic.service b/debian/ovn-ic.service
index 0797428..8e76d75 100644
--- a/debian/ovn-ic.service
+++ b/debian/ovn-ic.service
@@ -5,8 +5,9 @@ Requires=network.target
 
 [Service]
 Type=forking
+EnvironmentFile=-/etc/default/ovn-ic
 PIDFile=%t/ovn/ovn-ic.pid
-ExecStart=/usr/share/ovn/scripts/ovn-ctl start_ic --no-monitor
+ExecStart=/usr/share/ovn/scripts/ovn-ctl start_ic --no-monitor $OVN_CTL_OPTS
 ExecStop=/usr/share/ovn/scripts/ovn-ctl stop_ic
 Restart=on-failure
 LimitNOFILE=65535