From: cel@kernel.org
To: <kdevops@lists.linux.dev>
Cc: Chuck Lever <chuck.lever@oracle.com>
Subject: [PATCH v2 00/12] Replace terraform update_ssh_config module
Date: Wed, 5 Feb 2025 10:52:40 -0500 [thread overview]
Message-ID: <20250205155252.1317763-1-cel@kernel.org> (raw)
From: Chuck Lever <chuck.lever@oracle.com>
Luis suggested merging the way guestfs and terraform handle ssh
host config. Luis, please let me know if I've grossly misunderstood
your suggestion.
Vagrant is deprecated, so it will not be modified by these changes.
The two remaining virtualization mechanisms have the same underlying
purpose:
- Set up ssh to enable Ansible to have passwordless access to
the target nodes
- Make human ssh to the target nodes as painless as possible
But they have grown apart in implementation over the years. This
series is an attempt to build shared infrastructure that can be
triggered by the common "bringup" and "destroy" make targets.
Eventually IMO the SSH Kconfig options for terraform need to be
merged with the options from kconfigs/Kconfig.ssh. This series does
not attempt to do that.
In preparation for possibly moving the location of the
config_kdevops_* file, this series now treats the .ssh/config
Include directive a bit more carefully and consistently.
Changes since RFC:
- Split the RFC series into smaller patches for easier review
- The "Include" directive now follows CONFIG_KDEVOPS_SSH_CONFIG
- Various bug fixes and optimizations
Chuck Lever (12):
guestfs: Rename the update_ssh_config_guestfs role
update_ssh_config: Use {{ sshconfig }} instead of raw path
update_ssh_config: Fix ansible-lint nits
update_ssh_config: Run update_ssh_config during "make deps"
update_ssh_config: Add tags to steps
ssh.Makefile: Generate an sshdir variable
update_ssh_config: make Include directive follow ssh config directory
ssh.Makefile: Define a kdevops_ssh_config variable
update_ssh_config: Add always-run ssh clean-up steps
terraform: Add ssh hosts to ~/.ssh/config_kdevops_{{ sha1sum }}
terraform: "make mrproper" should remove terraform/*/.terraform
terraform: Remove the terrraform update_ssh_config module
Makefile | 1 +
playbooks/add_ssh_hosts_terraform.yml | 5 ++
.../add_ssh_hosts_terraform/defaults/main.yml | 2 +
.../add_ssh_hosts_terraform/tasks/main.yml | 33 +++++++
.../templates/ssh_config.j2 | 15 ++++
.../roles/update_ssh_config/tasks/main.yml | 88 +++++++++++++++++++
.../update_ssh_config_guestfs/tasks/main.yml | 71 ---------------
playbooks/update_ssh_config.yml | 4 +
playbooks/update_ssh_config_guestfs.yml | 4 -
scripts/bringup.Makefile | 6 ++
scripts/destroy_guestfs.sh | 6 --
scripts/guestfs.Makefile | 6 --
scripts/ssh.Makefile | 22 +++++
scripts/terraform.Makefile | 6 +-
terraform/aws/output.tf | 30 ++-----
terraform/aws/update_ssh_config.tf | 1 -
terraform/azure/output.tf | 22 ++---
terraform/azure/update_ssh_config.tf | 1 -
terraform/gce/output.tf | 31 ++-----
terraform/gce/update_ssh_config.tf | 1 -
terraform/oci/output.tf | 9 ++
terraform/oci/update_ssh_config.tf | 1 -
terraform/openstack/output.tf | 9 ++
terraform/openstack/update_ssh_config.tf | 1 -
terraform/update_ssh_config.tf | 17 ----
25 files changed, 218 insertions(+), 174 deletions(-)
create mode 100644 playbooks/add_ssh_hosts_terraform.yml
create mode 100644 playbooks/roles/add_ssh_hosts_terraform/defaults/main.yml
create mode 100644 playbooks/roles/add_ssh_hosts_terraform/tasks/main.yml
create mode 100644 playbooks/roles/add_ssh_hosts_terraform/templates/ssh_config.j2
create mode 100644 playbooks/roles/update_ssh_config/tasks/main.yml
delete mode 100644 playbooks/roles/update_ssh_config_guestfs/tasks/main.yml
create mode 100644 playbooks/update_ssh_config.yml
delete mode 100644 playbooks/update_ssh_config_guestfs.yml
delete mode 120000 terraform/aws/update_ssh_config.tf
delete mode 120000 terraform/azure/update_ssh_config.tf
delete mode 120000 terraform/gce/update_ssh_config.tf
create mode 100644 terraform/oci/output.tf
delete mode 120000 terraform/oci/update_ssh_config.tf
delete mode 120000 terraform/openstack/update_ssh_config.tf
delete mode 100644 terraform/update_ssh_config.tf
--
2.48.1
next 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 cel [this message]
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 ` [PATCH v2 05/12] update_ssh_config: Add tags to steps cel
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-1-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