From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 6D0661C5F13 for ; Thu, 4 Sep 2025 15:15:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756998945; cv=none; b=Bm6MQa0Np/S3AAWozKIgYyDRSq/3xRtSixSbquu2AmzYTc8e4EJO+Gi8tXF1o65+WQQQN+uEt+tfoYwTx4q+OJaY7KqQSUrN5FJNpQrvV68os4Owu+J06fBeJsTJSWa6hDyJlRGAKbGmS8zaSMlzeWeYwMnQweKlSN47sam4XR0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756998945; c=relaxed/simple; bh=qz8BMTQXABpD3SW+FSZdJnr++kYa6xkpOV/jgaoF1DQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TRdVO4ijBIjBJVIuRZvIzcmEqSb+Po83G/giHJUt8xXpdgGbg6/R0hGATA+fSPr9KgJ/VyncliahN9wvr2AOO/jftCrNkeJvu3OS/FGNzr3lt7aKPMND/kZ3vVXDUuEK1U5lyJge++QA8Gz6iEYJf/MsGG+s2SQAVBsd5GWXH04= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XOoO5QOU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XOoO5QOU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 08293C4CEF0; Thu, 4 Sep 2025 15:15:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756998945; bh=qz8BMTQXABpD3SW+FSZdJnr++kYa6xkpOV/jgaoF1DQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XOoO5QOUMmnq0TrOivEHQC5Q/PsSRHtxixkGPy3BlYnazLQ0av3bbYK/JvjITc6ir O8buaS+ccfB0CngSzJ/n+F/OkcJdYX0KHvG+N4neTRYg0mBaU5+vQcoPfE9Ow5MlJS DZzvbTKlaueNSPgrHHomADiVcvGvcO1Qjnlggs8+ktCiquF9LPFyIEtlMjNhB+I+W2 Cc4hTi+ltMGHU4+COTf6L8iV77KTNRajf0Lzg7yLp8/xF+5It9kSbpmZ4YCsaxllFP DtStaNGy2pjyjmjYtQY+b229u/In6KLbhzkqyrWGxxJaLGfRAdZMtOuf6jZcIqDXrg ZuJ/TT1d2Gs7w== From: Chuck Lever To: Cc: Chuck Lever , Luis Chamberlain Subject: [PATCH v3 32/36] devconfig: include the "service" group in the playbooks hosts list Date: Thu, 4 Sep 2025 11:15:20 -0400 Message-ID: <20250904151526.1596282-33-cel@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250904151526.1596282-1-cel@kernel.org> References: <20250904151526.1596282-1-cel@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 From: Chuck Lever Since commit 1cf0800c9ffc ("gen_hosts: templates: include localhost in the all group"), the devconfig playbook is no longer updating the nfsd service host. 1. Actually all the service hosts need to be updated by devconfig, so ensure devconfig runs against the service group. 2. Since devconfig can run against most workflows, add blank [service] groups to any inventory template that doesn't already have it. Fixes: 1cf0800c9ffc ("gen_hosts: templates: include localhost in the all group") Reviewed-by: Luis Chamberlain Signed-off-by: Chuck Lever --- playbooks/devconfig.yml | 2 +- playbooks/roles/gen_hosts/templates/blktests.j2 | 3 +++ playbooks/roles/gen_hosts/templates/builder.j2 | 4 ++++ playbooks/roles/gen_hosts/templates/cxl.j2 | 3 +++ playbooks/roles/gen_hosts/templates/ltp.j2 | 4 ++++ playbooks/roles/gen_hosts/templates/mmtests.j2 | 3 +++ playbooks/roles/gen_hosts/templates/selftests.j2 | 3 +++ playbooks/roles/gen_hosts/templates/sysbench.j2 | 3 +++ scripts/devconfig.Makefile | 2 -- scripts/firstconfig.Makefile | 1 - scripts/provision.Makefile | 1 - 11 files changed, 24 insertions(+), 5 deletions(-) diff --git a/playbooks/devconfig.yml b/playbooks/devconfig.yml index cebaa87a7228..f0ca7d767efe 100644 --- a/playbooks/devconfig.yml +++ b/playbooks/devconfig.yml @@ -1,6 +1,6 @@ --- - name: Configure developer environment on target systems - hosts: baseline:dev + hosts: baseline:dev:service gather_facts: false roles: - role: devconfig diff --git a/playbooks/roles/gen_hosts/templates/blktests.j2 b/playbooks/roles/gen_hosts/templates/blktests.j2 index 5bf50acbddac..6aa434c3383c 100644 --- a/playbooks/roles/gen_hosts/templates/blktests.j2 +++ b/playbooks/roles/gen_hosts/templates/blktests.j2 @@ -22,3 +22,6 @@ ansible_python_interpreter = "{{ kdevops_python_interpreter }}" {% endif %} [dev:vars] ansible_python_interpreter = "{{ kdevops_python_interpreter }}" +[service] +[service:vars] +ansible_python_interpreter = "{{ kdevops_python_interpreter }}" diff --git a/playbooks/roles/gen_hosts/templates/builder.j2 b/playbooks/roles/gen_hosts/templates/builder.j2 index eb8c736409b9..164201dc5ca4 100644 --- a/playbooks/roles/gen_hosts/templates/builder.j2 +++ b/playbooks/roles/gen_hosts/templates/builder.j2 @@ -12,3 +12,7 @@ ansible_python_interpreter = "{{ kdevops_python_interpreter }}" [dev] [dev:vars] ansible_python_interpreter = "{{ kdevops_python_interpreter }}" + +[service] +[service:vars] +ansible_python_interpreter = "{{ kdevops_python_interpreter }}" diff --git a/playbooks/roles/gen_hosts/templates/cxl.j2 b/playbooks/roles/gen_hosts/templates/cxl.j2 index 64bec4561b6c..cab7da246b11 100644 --- a/playbooks/roles/gen_hosts/templates/cxl.j2 +++ b/playbooks/roles/gen_hosts/templates/cxl.j2 @@ -16,3 +16,6 @@ ansible_python_interpreter = "{{ kdevops_python_interpreter }}" {% endif %} [dev:vars] ansible_python_interpreter = "{{ kdevops_python_interpreter }}" +[service] +[service:vars] +ansible_python_interpreter = "{{ kdevops_python_interpreter }}" diff --git a/playbooks/roles/gen_hosts/templates/ltp.j2 b/playbooks/roles/gen_hosts/templates/ltp.j2 index 828fd6362718..6946b3f3593b 100644 --- a/playbooks/roles/gen_hosts/templates/ltp.j2 +++ b/playbooks/roles/gen_hosts/templates/ltp.j2 @@ -24,3 +24,7 @@ ansible_python_interpreter = "{{ kdevops_python_interpreter }}" {% endif %} [dev:vars] ansible_python_interpreter = "{{ kdevops_python_interpreter }}" + +[service] +[service:vars] +ansible_python_interpreter = "{{ kdevops_python_interpreter }}" diff --git a/playbooks/roles/gen_hosts/templates/mmtests.j2 b/playbooks/roles/gen_hosts/templates/mmtests.j2 index 1252fe876e6c..8df4a3c31213 100644 --- a/playbooks/roles/gen_hosts/templates/mmtests.j2 +++ b/playbooks/roles/gen_hosts/templates/mmtests.j2 @@ -31,3 +31,6 @@ ansible_python_interpreter = "{{ kdevops_python_interpreter }}" {% endfor %} [mmtests:vars] ansible_python_interpreter = "{{ kdevops_python_interpreter }}" +[service] +[service:vars] +ansible_python_interpreter = "{{ kdevops_python_interpreter }}" diff --git a/playbooks/roles/gen_hosts/templates/selftests.j2 b/playbooks/roles/gen_hosts/templates/selftests.j2 index e505bbf194b4..af0d6b341048 100644 --- a/playbooks/roles/gen_hosts/templates/selftests.j2 +++ b/playbooks/roles/gen_hosts/templates/selftests.j2 @@ -22,3 +22,6 @@ ansible_python_interpreter = "{{ kdevops_python_interpreter }}" {% endif %} [dev:vars] ansible_python_interpreter = "{{ kdevops_python_interpreter }}" +[service] +[service:vars] +ansible_python_interpreter = "{{ kdevops_python_interpreter }}" diff --git a/playbooks/roles/gen_hosts/templates/sysbench.j2 b/playbooks/roles/gen_hosts/templates/sysbench.j2 index 107eebc5fbce..e30773c1b84a 100644 --- a/playbooks/roles/gen_hosts/templates/sysbench.j2 +++ b/playbooks/roles/gen_hosts/templates/sysbench.j2 @@ -22,3 +22,6 @@ ansible_python_interpreter = "{{ kdevops_python_interpreter }}" {% endif %} [dev:vars] ansible_python_interpreter = "{{ kdevops_python_interpreter }}" +[service] +[service:vars] +ansible_python_interpreter = "{{ kdevops_python_interpreter }}" diff --git a/scripts/devconfig.Makefile b/scripts/devconfig.Makefile index 146c70f78897..db68dd183e9d 100644 --- a/scripts/devconfig.Makefile +++ b/scripts/devconfig.Makefile @@ -57,7 +57,6 @@ extend-extra-args-devconfig: PHONY += devconfig devconfig: $(KDEVOPS_NODES) $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ - --limit 'baseline:dev:nfsd' \ $(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml \ --extra-vars="$(BOOTLINUX_ARGS)" \ --extra-vars '{ kdevops_cli_install: True }' \ @@ -72,7 +71,6 @@ ifeq (y,$(CONFIG_SYSCTL_TUNING)) PHONY += sysctl-tunings sysctl-tunings: $(KDEVOPS_NODES) $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ - --limit 'baseline:dev:nfsd' \ $(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml \ --extra-vars="$(BOOTLINUX_ARGS)" $(LIMIT_HOSTS) --tags vars,sysctl diff --git a/scripts/firstconfig.Makefile b/scripts/firstconfig.Makefile index 9f8a63a8ff84..4904afcc72f0 100644 --- a/scripts/firstconfig.Makefile +++ b/scripts/firstconfig.Makefile @@ -2,7 +2,6 @@ firstconfig: $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ - --limit 'baseline:dev' \ --extra-vars '{ kdevops_cli_install: True }' \ --tags vars_simple,firstconfig \ $(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml diff --git a/scripts/provision.Makefile b/scripts/provision.Makefile index f04264f6b9ea..b13d31e8093e 100644 --- a/scripts/provision.Makefile +++ b/scripts/provision.Makefile @@ -70,7 +70,6 @@ KDEVOPS_MRPROPER += $(KDEVOPS_PROVISIONED_DEVCONFIG) $(KDEVOPS_PROVISIONED_DEVCONFIG): $(Q)if [[ "$(CONFIG_KDEVOPS_ANSIBLE_PROVISION_PLAYBOOK)" != "" ]]; then \ ansible-playbook $(ANSIBLE_VERBOSE) \ - --limit 'baseline:dev' \ $(KDEVOPS_PLAYBOOKS_DIR)/$(KDEVOPS_ANSIBLE_PROVISION_PLAYBOOK) ;\ fi $(Q)touch $(KDEVOPS_PROVISIONED_DEVCONFIG) -- 2.51.0