Merge ~troyanov/maas:backport-6b04c2a-3.5 into maas:3.5

Proposed by Anton Troyanov
Status: Merged
Approved by: Anton Troyanov
Approved revision: 6837277cf60b661a5ee59409a6a8e378a48a3ae3
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~troyanov/maas:backport-6b04c2a-3.5
Merge into: maas:3.5
Diff against target: 12 lines (+1/-0)
1 file modified
debian/maas-region-api.maas-apiserver.service (+1/-0)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Anton Troyanov Approve
Review via email: mp+463757@code.launchpad.net

Commit message

fix: lp-2060297. Do not start apiserver until the unix socket has been created.

(cherry picked from commit 6b04c2ab4deab3c0d799215a226b4217e9139399)

To post a comment you must log in.
Revision history for this message
Anton Troyanov (troyanov) wrote :

Self approving backport

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b backport-6b04c2a-3.5 lp:~troyanov/maas/+git/maas into -b 3.5 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 6837277cf60b661a5ee59409a6a8e378a48a3ae3

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/maas-region-api.maas-apiserver.service b/debian/maas-region-api.maas-apiserver.service
2index bcdd875..c120449 100644
3--- a/debian/maas-region-api.maas-apiserver.service
4+++ b/debian/maas-region-api.maas-apiserver.service
5@@ -4,6 +4,7 @@ Documentation=https://maas.io/docs
6 Requires=network-online.target
7 After=network-online.target
8 ConditionPathExists=/etc/maas/regiond.conf
9+ConditionPathExists=/var/lib/maas/apiserver-http.sock
10
11 [Service]
12 User=maas

Subscribers

People subscribed via source and target branches