From: Luis Chamberlain <mcgrof@kernel.org>
To: kdevops@lists.linux.dev, da.gomez@samsung.com, p.raghav@samsung.com
Cc: Luis Chamberlain <mcgrof@kernel.org>
Subject: [PATCH 6/6] journal-server: fix by adjusting ordering
Date: Thu, 25 Jan 2024 12:35:07 -0800 [thread overview]
Message-ID: <20240125203507.430113-7-mcgrof@kernel.org> (raw)
In-Reply-To: <20240125203507.430113-1-mcgrof@kernel.org>
Now that we have done all the legwork to address ordering for bringup
and allow for items to be setup / installed with the devconfig playbook
for specific features, prior to running all generic devconfig tasks,
move the systemd remote journal server and client setup to run early.
Fix also ensuring we only try to setup the server once.
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
playbooks/roles/devconfig/tasks/main.yml | 1 +
scripts/journal-server.Makefile | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/playbooks/roles/devconfig/tasks/main.yml b/playbooks/roles/devconfig/tasks/main.yml
index 061d05acdc80..3e38d8f49cdf 100644
--- a/playbooks/roles/devconfig/tasks/main.yml
+++ b/playbooks/roles/devconfig/tasks/main.yml
@@ -485,6 +485,7 @@
ansible.builtin.systemd_service:
name: systemd-journal-remote.service
state: started
+ run_once: true
when:
- devconfig_enable_systemd_journal_remote|bool
diff --git a/scripts/journal-server.Makefile b/scripts/journal-server.Makefile
index 3c32d5df982e..23a149bda87c 100644
--- a/scripts/journal-server.Makefile
+++ b/scripts/journal-server.Makefile
@@ -40,7 +40,8 @@ journal-ln:
--tags vars_extra,journal_ln \
$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
-KDEVOPS_BRING_UP_DEPS += journal-server
+KDEVOPS_BRING_UP_DEPS_EARLY += journal-server
+KDEVOPS_BRING_UP_DEPS_EARLY += journal-client
journal-help:
@echo "journal-server - Setup systemd-journal-remote on localhost"
--
2.42.0
prev parent reply other threads:[~2024-01-25 20:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-25 20:35 [PATCH 0/6] Fix ordering for systemd remote journal support Luis Chamberlain
2024-01-25 20:35 ` [PATCH 1/6] mirror: add a smart git check Luis Chamberlain
2024-01-25 20:35 ` [PATCH 2/6] bringup: split provisioning into 2 steps Luis Chamberlain
2024-01-25 20:35 ` [PATCH 3/6] bringup: share bringup method targe and agument by two steps Luis Chamberlain
2024-01-25 20:35 ` [PATCH 4/6] provision: move all provisioning things to its own Makefile Luis Chamberlain
2024-01-25 20:35 ` [PATCH 5/6] bringup: move journal-server setup early Luis Chamberlain
2024-01-25 20:35 ` Luis Chamberlain [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240125203507.430113-7-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=da.gomez@samsung.com \
--cc=kdevops@lists.linux.dev \
--cc=p.raghav@samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).