From: cel@kernel.org
To: <kdevops@lists.linux.dev>
Cc: Chuck Lever <chuck.lever@oracle.com>
Subject: [PATCH v2 05/12] update_ssh_config: Add tags to steps
Date: Wed, 5 Feb 2025 10:52:45 -0500 [thread overview]
Message-ID: <20250205155252.1317763-6-cel@kernel.org> (raw)
In-Reply-To: <20250205155252.1317763-1-cel@kernel.org>
From: Chuck Lever <chuck.lever@oracle.com>
I'm about to add new functions to the update_ssh_config role that
can be run by specifying tags on the ansible-playbook command line.
To run only the steps that update the controller's .ssh/config
Include directive, add a "deps" tag.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
playbooks/roles/update_ssh_config/tasks/main.yml | 8 ++++++++
scripts/ssh.Makefile | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/playbooks/roles/update_ssh_config/tasks/main.yml b/playbooks/roles/update_ssh_config/tasks/main.yml
index 6a7b58d8a556..417781936f7f 100644
--- a/playbooks/roles/update_ssh_config/tasks/main.yml
+++ b/playbooks/roles/update_ssh_config/tasks/main.yml
@@ -1,10 +1,12 @@
---
- name: Check that the controller's ssh config file exists
+ tags: deps
ansible.builtin.stat:
path: "{{ sshconfig }}"
register: ssh_config
- name: Check that the kdevops Include directive is present
+ tags: deps
ansible.builtin.lineinfile:
path: "{{ sshconfig }}"
regexp: "Include ~/.ssh/config_kdevops_*"
@@ -15,6 +17,7 @@
when: ssh_config.stat.exists
- name: Check that the Include directive has a kdevops_version comment
+ tags: deps
ansible.builtin.lineinfile:
path: "{{ sshconfig }}"
regexp: "^#(.*)kdevops_version(.*)"
@@ -27,6 +30,7 @@
# If both the include directive was found and kdevops version comment was found
# we bail right away to avoid updating the ssh config file always.
- name: Check if the new fixed include directive was used
+ tags: deps
ansible.builtin.meta: end_play
when:
- ssh_config.stat.exists
@@ -34,6 +38,7 @@
- fixed_ssh_entry.found
- name: Remove the stale Include directive
+ tags: deps
ansible.builtin.lineinfile:
path: "{{ sshconfig }}"
line: "Include ~/.ssh/config_kdevops_*"
@@ -41,6 +46,7 @@
when: ssh_config.stat.exists
- name: Remove stale kdevops comments
+ tags: deps
ansible.builtin.lineinfile:
path: "{{ sshconfig }}"
regexp: "^#(.*)kdevops(.*)"
@@ -48,6 +54,7 @@
when: ssh_config.stat.exists
- name: Remove extraneous extra new lines
+ tags: deps
ansible.builtin.replace:
path: "{{ sshconfig }}"
regexp: '(^\s*$)'
@@ -56,6 +63,7 @@
# ssh include directives must follow a new line.
- name: Add a proper Include directive to {{ sshconfig }}
+ tags: deps
ansible.builtin.blockinfile:
path: "{{ sshconfig }}"
insertbefore: BOF
diff --git a/scripts/ssh.Makefile b/scripts/ssh.Makefile
index cf79a1dd6c27..caa4bc797c48 100644
--- a/scripts/ssh.Makefile
+++ b/scripts/ssh.Makefile
@@ -25,7 +25,7 @@ $(KDEVOPS_SSH_PRIVKEY): .config
PHONY += update-ssh-config
update-ssh-config:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
- --inventory localhost, \
+ --inventory localhost, --tags deps \
playbooks/update_ssh_config.yml \
--extra-vars=@./extra_vars.yaml \
-e 'ansible_python_interpreter=/usr/bin/python3'
--
2.48.1
next prev parent reply other threads:[~2025-02-05 15:52 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-05 15:52 [PATCH v2 00/12] Replace terraform update_ssh_config module cel
2025-02-05 15:52 ` [PATCH v2 01/12] guestfs: Rename the update_ssh_config_guestfs role cel
2025-02-05 15:52 ` [PATCH v2 02/12] update_ssh_config: Use {{ sshconfig }} instead of raw path cel
2025-02-05 15:52 ` [PATCH v2 03/12] update_ssh_config: Fix ansible-lint nits cel
2025-02-05 15:52 ` [PATCH v2 04/12] update_ssh_config: Run update_ssh_config during "make deps" cel
2025-02-05 15:52 ` cel [this message]
2025-02-05 15:52 ` [PATCH v2 06/12] ssh.Makefile: Generate an sshdir variable cel
2025-02-05 15:52 ` [PATCH v2 07/12] update_ssh_config: make Include directive follow ssh config directory cel
2025-02-06 19:58 ` Chuck Lever
2025-02-05 15:52 ` [PATCH v2 08/12] ssh.Makefile: Define a kdevops_ssh_config variable cel
2025-02-05 17:42 ` Luis Chamberlain
2025-02-06 2:36 ` Chuck Lever
2025-02-05 15:52 ` [PATCH v2 09/12] update_ssh_config: Add always-run ssh clean-up steps cel
2025-02-05 15:52 ` [PATCH v2 10/12] terraform: Add ssh hosts to ~/.ssh/config_kdevops_{{ sha1sum }} cel
2025-02-05 15:52 ` [PATCH v2 11/12] terraform: "make mrproper" should remove terraform/*/.terraform cel
2025-02-05 15:52 ` [PATCH v2 12/12] terraform: Remove the terrraform update_ssh_config module cel
2025-02-05 17:44 ` [PATCH v2 00/12] Replace terraform " Luis Chamberlain
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=20250205155252.1317763-6-cel@kernel.org \
--to=cel@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=kdevops@lists.linux.dev \
/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