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 3999D2DFA2B for ; Tue, 2 Sep 2025 20:30:09 +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=1756845010; cv=none; b=jVRinpNpJNfSPPfyW0nGFGdd1dWa5vP+10H0TgFjHOWYWp5ka53njKSsV7DB/OqXLgGn6mj99vVldvL7LVS3DUHYnwF+pB7/uP2GE7JCtGVGgQgKV1KnVeaNrVVE3V4s1vD/NgEjG+EvuXcAmNU6AkqBl8/bfivdaI/RAjvts2A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756845010; c=relaxed/simple; bh=rcMzIASAOSCKbee7qzXfzULA5jOnkqggeFVLbMSq0fU=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=iFfNR95Iv9Z2XTlscm9NND2Ki7MHT65ktE+gLZMG2teLvmxdbCjthU7uXc71TiaE21ASuZ3POvZmMpic8geR6/hssy/J3koC2hpzEMwAi87YWHYnUHSeyptXjpzYGtrWujoEch5XJoRRNAtKLMpWEan8El5eAXR5OxczKugbTRE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PjTdTULJ; 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="PjTdTULJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 780A8C4CEED; Tue, 2 Sep 2025 20:30:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756845009; bh=rcMzIASAOSCKbee7qzXfzULA5jOnkqggeFVLbMSq0fU=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=PjTdTULJ8sE77BfnhtJ+yaQKp8l3cLoJ2LqDVVpP547z2CK1pf/ICq+B8rJpDEHqe z5dhunoWx+H+OhwPPpWparsL+nk5cZswl3PxqUnhKa4bXHBdT50nX3l5PsjbQDGI7A VXcH5mbyQHspcA+cE6HnQc3wUcI1IVSj309JumJEuIxgZ4BuabMrlThO3v/gjJVi7t y08BBKlKA65gEQK+JQsM4maorY0qMjPNzx3bEPSs/eT2wcq/PnAFVekGbBDO6vv3In +NkJZVlgW9qBaW9jGTOtd4X8tmwMpKkUXZofv0dRCEEPikmRiLDcZSFWL8+koR5Z94 7UJyD6zVRxHKw== Message-ID: <4004010c-5ade-4143-b529-bf426249733d@kernel.org> Date: Tue, 2 Sep 2025 16:30:08 -0400 Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 33/37] devconfig: include the "service" group in the playbooks hosts list To: Daniel Gomez , kdevops@lists.linux.dev Cc: Chuck Lever References: <20250902135426.815079-1-cel@kernel.org> <20250902135426.815079-34-cel@kernel.org> <68ce7537-8d59-4df0-8c58-4536dcc4b372@kernel.org> Content-Language: en-US From: Chuck Lever Organization: kernel.org In-Reply-To: <68ce7537-8d59-4df0-8c58-4536dcc4b372@kernel.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 9/2/25 4:27 PM, Daniel Gomez wrote: > On 02/09/2025 15.54, Chuck Lever wrote: >> 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") >> Signed-off-by: Chuck Lever >> --- >> playbooks/devconfig.yml | 2 +- >> playbooks/roles/gen_hosts/templates/blktests.j2 | 3 +++ >> 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 | 9 ++++----- >> scripts/firstconfig.Makefile | 2 +- >> scripts/provision.Makefile | 2 +- >> 10 files changed, 26 insertions(+), 8 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/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..fedf1f2ca21f 100644 >> --- a/scripts/devconfig.Makefile >> +++ b/scripts/devconfig.Makefile >> @@ -57,11 +57,10 @@ extend-extra-args-devconfig: >> PHONY += devconfig >> devconfig: $(KDEVOPS_NODES) >> $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ >> - --limit 'baseline:dev:nfsd' \ >> + --limit 'baseline:dev:service' \ > > You don't need --limit at all (I missed this cleanup!). The playbook already has > hosts: baseline:dev:service. > >> $(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml \ >> --extra-vars="$(BOOTLINUX_ARGS)" \ >> - --extra-vars '{ kdevops_cli_install: True }' \ >> - $(LIMIT_HOSTS) >> + --extra-vars '{ kdevops_cli_install: True }' > > Any reason to remove LIMIT_HOSTS support from here? Maybe not useful for these > targets? Agreed, if we are simply removing the "--limit" option then I suppose the $LIMIT_HOSTS is no longer redundant and should stay. >> devconfig-generic-help-menu: >> @echo "devconfig - Ensures generic system setup and is up to date" >> @@ -72,9 +71,9 @@ ifeq (y,$(CONFIG_SYSCTL_TUNING)) >> PHONY += sysctl-tunings >> sysctl-tunings: $(KDEVOPS_NODES) >> $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ >> - --limit 'baseline:dev:nfsd' \ >> + --limit 'baseline:dev:service' \ > > Same here. Not needed. > >> $(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml \ >> - --extra-vars="$(BOOTLINUX_ARGS)" $(LIMIT_HOSTS) --tags vars,sysctl >> + --extra-vars="$(BOOTLINUX_ARGS)" --tags vars,sysctl >> >> devconfig-help-menu: >> @echo "Target node configuration options" >> diff --git a/scripts/firstconfig.Makefile b/scripts/firstconfig.Makefile >> index 9f8a63a8ff84..5651a07d0b66 100644 >> --- a/scripts/firstconfig.Makefile >> +++ b/scripts/firstconfig.Makefile >> @@ -2,7 +2,7 @@ >> >> firstconfig: >> $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ >> - --limit 'baseline:dev' \ >> + --limit 'baseline:dev:service' \ > > Same here... > >> --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..62a5692904c9 100644 >> --- a/scripts/provision.Makefile >> +++ b/scripts/provision.Makefile >> @@ -70,7 +70,7 @@ KDEVOPS_MRPROPER += $(KDEVOPS_PROVISIONED_DEVCONFIG) >> $(KDEVOPS_PROVISIONED_DEVCONFIG): >> $(Q)if [[ "$(CONFIG_KDEVOPS_ANSIBLE_PROVISION_PLAYBOOK)" != "" ]]; then \ >> ansible-playbook $(ANSIBLE_VERBOSE) \ >> - --limit 'baseline:dev' \ >> + --limit 'baseline:dev:service' \ > > And here (playbook is devconfig.yml) > >> $(KDEVOPS_PLAYBOOKS_DIR)/$(KDEVOPS_ANSIBLE_PROVISION_PLAYBOOK) ;\ >> fi >> $(Q)touch $(KDEVOPS_PROVISIONED_DEVCONFIG) -- Chuck Lever