From: Chuck Lever <cel@kernel.org>
To: <kdevops@lists.linux.dev>
Cc: Chuck Lever <chuck.lever@oracle.com>,
Luis Chamberlain <mcgrof@kernel.org>
Subject: [PATCH v3 32/36] devconfig: include the "service" group in the playbooks hosts list
Date: Thu, 4 Sep 2025 11:15:20 -0400 [thread overview]
Message-ID: <20250904151526.1596282-33-cel@kernel.org> (raw)
In-Reply-To: <20250904151526.1596282-1-cel@kernel.org>
From: Chuck Lever <chuck.lever@oracle.com>
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 <mcgrof@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
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
next prev parent reply other threads:[~2025-09-04 15:15 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-04 15:14 [PATCH v3 00/36] Various fixes Chuck Lever
2025-09-04 15:14 ` [PATCH v3 01/36] scripts: Update gen_ssh_key.sh Chuck Lever
2025-09-04 15:14 ` [PATCH v3 02/36] terraform/azure: Fix count of managed disks Chuck Lever
2025-09-04 15:14 ` [PATCH v3 03/36] terraform/azure: Remove tags from terraform configuration Chuck Lever
2025-09-04 15:14 ` [PATCH v3 04/36] terraform/azure: Enable network acceleration Chuck Lever
2025-09-04 15:14 ` [PATCH v3 05/36] terraform/azure: Make the resource group name a variable Chuck Lever
2025-09-04 15:14 ` [PATCH v3 06/36] terraform/azure: Remove the provider version constraint Chuck Lever
2025-09-04 15:14 ` [PATCH v3 07/36] terraform/azure: Update the RHEL publishers Chuck Lever
2025-09-04 15:14 ` [PATCH v3 08/36] terraform/oci: Work around oracle/oci provider bug Chuck Lever
2025-09-04 15:14 ` [PATCH v3 09/36] terraform/oci: Add Kconfig choices for disk performance provisioning Chuck Lever
2025-09-04 15:14 ` [PATCH v3 10/36] terraform/oci: Enable preemptible compute instances Chuck Lever
2025-09-04 15:14 ` [PATCH v3 11/36] terraform/aws: Fix zone selection for us_west1 Chuck Lever
2025-09-04 15:15 ` [PATCH v3 12/36] Revert "terraform/aws: Add Oracle Linux AMI selections" Chuck Lever
2025-09-04 15:15 ` [PATCH v3 13/36] terraform/aws: Remove unused terraform tags Chuck Lever
2025-09-04 15:15 ` [PATCH v3 14/36] terraform/GCE: Fix the default disk throughput values Chuck Lever
2025-09-04 15:15 ` [PATCH v3 15/36] terraform/gce: Remove unused tags Chuck Lever
2025-09-04 15:15 ` [PATCH v3 16/36] terraform/gce: Remove support for Fedora Chuck Lever
2025-09-04 15:15 ` [PATCH v3 17/36] terraform/gce: Update existing machine types and introduce new ones Chuck Lever
2025-09-04 15:15 ` [PATCH v3 18/36] terraform: Create the user's .ssh/config if it does not already exist Chuck Lever
2025-09-04 15:15 ` [PATCH v3 19/36] pynfs: Don't install xdrlib3 on older RHEL Chuck Lever
2025-09-04 15:15 ` [PATCH v3 20/36] guestfs: Update the guestfs playbook description Chuck Lever
2025-09-04 15:15 ` [PATCH v3 21/36] gen_hosts: Add 'localhost' to the [all] group Chuck Lever
2025-09-04 15:15 ` [PATCH v3 22/36] guestfs: Don't run the 'destroy' tags on the controller Chuck Lever
2025-09-04 15:15 ` [PATCH v3 23/36] base_image: Skip "locales-all" package installation Chuck Lever
2025-09-04 15:15 ` [PATCH v3 24/36] update_etc_hosts: ipaddr Chuck Lever
2025-09-04 15:15 ` [PATCH v3 25/36] Add an Ansible requirements.yml file Chuck Lever
2025-09-04 15:15 ` [PATCH v3 26/36] terraform/oci: Clean up the route table resource Chuck Lever
2025-09-04 15:15 ` [PATCH v3 27/36] guestfs: Correct the spelling of "drives" Chuck Lever
2025-09-04 15:15 ` [PATCH v3 28/36] guestfs: Configure how many extra drives to provision Chuck Lever
2025-09-04 15:15 ` [PATCH v3 29/36] ltp: Replace /opt with a symlink to data partition Chuck Lever
2025-09-04 15:15 ` [PATCH v3 30/36] terraform: Squelch Ansible complaints about missing inventory file Chuck Lever
2025-09-04 15:15 ` [PATCH v3 31/36] terraform: Skip localhost when waiting for targets to reboot Chuck Lever
2025-09-04 15:15 ` Chuck Lever [this message]
2025-09-05 10:25 ` [PATCH v3 32/36] devconfig: include the "service" group in the playbooks hosts list Daniel Gomez
2025-09-04 15:15 ` [PATCH v3 33/36] Makefile: Remove CONFIG_TOPDIR_PATH_HAS_SHA256SUM Chuck Lever
2025-09-04 15:15 ` [PATCH v3 34/36] Makefile: Set TOPDIR_PATH and generate its sha256sum at run time Chuck Lever
2025-09-04 15:15 ` [PATCH v3 35/36] ansible.cfg: generate an ansible.cfg file in TOPDIR Chuck Lever
2025-09-04 15:15 ` [PATCH v3 36/36] inventory: generate the inventory pathname dynamically Chuck Lever
2025-09-05 13:21 ` Daniel Gomez
2025-09-04 17:16 ` [PATCH v3 00/36] Various fixes Luis Chamberlain
2025-09-05 13:06 ` Daniel Gomez
2025-09-05 16:37 ` Chuck Lever
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=20250904151526.1596282-33-cel@kernel.org \
--to=cel@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=kdevops@lists.linux.dev \
--cc=mcgrof@kernel.org \
/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