[PATCH 5/6] bringup: move journal-server setup early

[Luis Chamberlain <mcgrof@kernel.org>]

Now that we have done the cleaning up of the provisioners and have
defined an early target task which we can piggy the back on top before
the devconfig playbook is run, move the journal server setup early.

This does not make any functional changes to the file to make it easier
to review the functional changes, those will be done next.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
 Makefile                        |  2 ++
 scripts/bringup.Makefile        | 56 ---------------------------------
 scripts/journal-server.Makefile | 55 ++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 56 deletions(-)
 create mode 100644 scripts/journal-server.Makefile

diff --git a/Makefile b/Makefile
index 67e13edbf6ff..4ab805ae7ff5 100644
--- a/Makefile
+++ b/Makefile
@@ -86,6 +86,8 @@ endif # CONFIG_NEEDS_LOCAL_DEVELOPMENT_PATH
 ANSIBLE_EXTRA_ARGS += $(LOCAL_DEVELOPMENT_ARGS)
 
 include scripts/provision.Makefile
+include scripts/journal-server.Makefile
+
 KDEVOPS_BRING_UP_DEPS += $(KDEVOPS_BRING_UP_DEPS_EARLY)
 KDEVOPS_BRING_UP_DEPS += $(KDEVOPS_PROVISIONED_DEVCONFIG)
 
diff --git a/scripts/bringup.Makefile b/scripts/bringup.Makefile
index 6e64b6c12172..5a4778473eab 100644
--- a/scripts/bringup.Makefile
+++ b/scripts/bringup.Makefile
@@ -33,50 +33,6 @@ ifeq (y,$(CONFIG_KDEVOPS_SETUP_SIW))
 KDEVOPS_BRING_UP_DEPS += siw
 endif # KDEVOPS_SETUP_SIW
 
-ifeq (y,$(CONFIG_DEVCONFIG_ENABLE_SYSTEMD_JOURNAL_REMOTE))
-
-JOURNAL_REMOTE:=$(subst ",,$(CONFIG_DEVCONFIG_SYSTEMD_JOURNAL_REMOTE_URL))
-ANSIBLE_EXTRA_ARGS += devconfig_systemd_journal_remote_url=$(JOURNAL_REMOTE)
-ANSIBLE_EXTRA_ARGS += devconfig_enable_systemd_journal_remote='True'
-
-journal-client:
-	@$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
-		-f 30 -i hosts  \
-		--extra-vars '{ kdevops_cli_install: True }' \
-		--tags vars_simple,journal \
-		$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
-
-journal-server:
-	@$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
-		$(KDEVOPS_PLAYBOOKS_DIR)/install_systemd_journal_remote.yml \
-		-e 'ansible_python_interpreter=/usr/bin/python3'
-
-journal-restart:
-	@$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
-		-f 30 -i hosts  \
-		--tags vars_extra,journal-upload-restart \
-		$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
-
-journal-status:
-	@$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
-		-f 30 -i hosts  \
-		--tags vars_extra,journal-status \
-		$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
-
-journal-ls:
-	@$(Q)./workflows/kdevops/scripts/jounal-ls.sh /var/log/journal/remote/
-
-journal-ln:
-	@$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
-		-f 30 -i hosts  \
-		--tags vars_extra,journal_ln \
-		$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
-
-KDEVOPS_BRING_UP_DEPS += journal-server
-
-endif
-
 update_etc_hosts:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		-f 30 -i hosts playbooks/update_etc_hosts.yml
@@ -100,18 +56,6 @@ bringup-setup-help-menu:
 
 HELP_TARGETS += bringup-setup-help-menu
 
-ifeq (y,$(CONFIG_DEVCONFIG_ENABLE_SYSTEMD_JOURNAL_REMOTE))
-journal-help:
-	@echo "journal-server	   - Setup systemd-journal-remote on localhost"
-	@echo "journal-client	   - Setup systemd-journal-upload on clients"
-	@echo "journal-restart	   - Restart client upload service"
-	@echo "journal-status	   - Ensure systemd-journal-remote works"
-	@echo "journal-ls          - List journals available and sizes"
-	@echo "journal-ln          - Add symlinks with hostnames"
-
-HELP_TARGETS += journal-help
-endif
-
 bringup-setup-help-end:
 	@echo ""
 
diff --git a/scripts/journal-server.Makefile b/scripts/journal-server.Makefile
new file mode 100644
index 000000000000..3c32d5df982e
--- /dev/null
+++ b/scripts/journal-server.Makefile
@@ -0,0 +1,55 @@
+# SPDX-License-Identifier: copyleft-next-0.3.1
+
+ifeq (y,$(CONFIG_DEVCONFIG_ENABLE_SYSTEMD_JOURNAL_REMOTE))
+
+JOURNAL_REMOTE:=$(subst ",,$(CONFIG_DEVCONFIG_SYSTEMD_JOURNAL_REMOTE_URL))
+ANSIBLE_EXTRA_ARGS += devconfig_systemd_journal_remote_url=$(JOURNAL_REMOTE)
+ANSIBLE_EXTRA_ARGS += devconfig_enable_systemd_journal_remote='True'
+
+journal-client:
+	@$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
+		-f 30 -i hosts  \
+		--extra-vars '{ kdevops_cli_install: True }' \
+		--tags vars_simple,journal \
+		$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
+
+journal-server:
+	@$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
+		--inventory localhost, \
+		$(KDEVOPS_PLAYBOOKS_DIR)/install_systemd_journal_remote.yml \
+		-e 'ansible_python_interpreter=/usr/bin/python3'
+
+journal-restart:
+	@$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
+		-f 30 -i hosts  \
+		--tags vars_extra,journal-upload-restart \
+		$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
+
+journal-status:
+	@$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
+		-f 30 -i hosts  \
+		--tags vars_extra,journal-status \
+		$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
+
+journal-ls:
+	@$(Q)./workflows/kdevops/scripts/jounal-ls.sh /var/log/journal/remote/
+
+journal-ln:
+	@$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
+		-f 30 -i hosts  \
+		--tags vars_extra,journal_ln \
+		$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
+
+KDEVOPS_BRING_UP_DEPS += journal-server
+
+journal-help:
+	@echo "journal-server	   - Setup systemd-journal-remote on localhost"
+	@echo "journal-client	   - Setup systemd-journal-upload on clients"
+	@echo "journal-restart	   - Restart client upload service"
+	@echo "journal-status	   - Ensure systemd-journal-remote works"
+	@echo "journal-ls          - List journals available and sizes"
+	@echo "journal-ln          - Add symlinks with hostnames"
+
+HELP_TARGETS += journal-help
+
+endif
-- 
2.42.0