From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 679D9137C20 for ; Thu, 25 Jan 2024 20:35:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706214915; cv=none; b=lguan+nP9NvA7ooV2ix6zkCuQ5hubnS+l+rk29yKCPf6Y+/8tzZTjjHMn1abif/jW5X7yCSoPbPKYUGnfOgBHCpwLBZ3y+ox+3ou+opO5otwyZWbYgbvi7FLaVy6nKV9Pcj9CJdj+LBkVXX8scLVAOOsRyQvAfdZbMKiFwIK0d0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706214915; c=relaxed/simple; bh=9SpDAfDlpaXC6xymmyrFqJEcjlvLT3PQ6iBQuLvVIR0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M2rmhJoAxXlLKEJmFvgkjz/F5S1rAPB0ehaBEYXvaQ3ZSbk95+xWXZ2ZYRVzYJdXBwE2QJtByBteA0uioanOfB+b3uM7C5RdEADrKuweUGNMIsp3efhSNeggfAudZeyVzAuRRGyT0DSTlMBYeA18T4Sjr0JCplY5r/Dg93YgyCU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=QIfNLHXb; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="QIfNLHXb" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=BA8SR+3SzmQmKbz8b/zvQp9GAYbKprsMO1a0pr+nopc=; b=QIfNLHXbmM8o2q4npXU+puq2TX S8kepu0edTMI713AaaR5TbkopCBTl9GQmN4gqyFfpcbEMitCxPptGWdxBKaN0DGK9Py2MlTscnSIZ 6UWkDVORxkwfBn+8AhovIwC5A6Cl+d2pEbwo83n3/w+h9it3kuY78XPA3L3t3MwTPhAkeJa33tnO7 l5n6roWOHwbkP1Bj+wY5RpNC4pVTJcRrJCHPZ/OnDg21EvtORmSt9wDezlPLguaMaDdDF8s880nHT /PZOraxXeNM8zKX8U64yisTuVMhX0e5Rox3hA5IvyWaIeALf9i1PPFwbAmUV3m1s5VDFYPYwVjCUl LgYhUR5g==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rT6RK-00000001ntn-2eyG; Thu, 25 Jan 2024 20:35:10 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev, da.gomez@samsung.com, p.raghav@samsung.com Cc: Luis Chamberlain Subject: [PATCH 6/6] journal-server: fix by adjusting ordering Date: Thu, 25 Jan 2024 12:35:07 -0800 Message-ID: <20240125203507.430113-7-mcgrof@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240125203507.430113-1-mcgrof@kernel.org> References: <20240125203507.430113-1-mcgrof@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Luis Chamberlain 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 --- 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