From: Chuck Lever <chuck.lever@oracle.com>
To: Luis Chamberlain <mcgrof@kernel.org>, cel@kernel.org
Cc: kdevops@lists.linux.dev
Subject: Re: [PATCH v2 08/12] ssh.Makefile: Define a kdevops_ssh_config variable
Date: Wed, 5 Feb 2025 21:36:34 -0500 [thread overview]
Message-ID: <4d44bfdc-ca44-47dc-9358-e737d3571179@oracle.com> (raw)
In-Reply-To: <Z6OjDy-vyNYRozYk@bombadil.infradead.org>
On 2/5/25 12:42 PM, Luis Chamberlain wrote:
> On Wed, Feb 05, 2025 at 10:52:48AM -0500, cel@kernel.org wrote:
>> From: Chuck Lever <chuck.lever@oracle.com>
>>
>> Create a global variable that contains the pathname of the config
>> file that stores ephemeral ssh host entries. That way the scripts
>> don't have to keep creating this pathname.
>>
>> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
>> ---
>> scripts/ssh.Makefile | 9 +++++++++
>> 1 file changed, 9 insertions(+)
>>
>> diff --git a/scripts/ssh.Makefile b/scripts/ssh.Makefile
>> index 150001d8bbbd..58ffe1e05d68 100644
>> --- a/scripts/ssh.Makefile
>> +++ b/scripts/ssh.Makefile
>> @@ -7,10 +7,19 @@ ANSIBLE_EXTRA_ARGS += kexalgorithms=$(SSH_KEXALGORITHMS)
>> endif
>>
>> ifeq (y,$(CONFIG_KDEVOPS_SSH_CONFIG_UPDATE))
>> +
>> SSH_CONFIG_FILE:=$(subst ",,$(CONFIG_KDEVOPS_SSH_CONFIG))
>> ANSIBLE_EXTRA_ARGS += sshconfig=$(CONFIG_KDEVOPS_SSH_CONFIG)
>> ANSIBLE_EXTRA_ARGS += sshdir=$(shell dirname $(SSH_CONFIG_FILE))
>> +
>> +ifeq (y,$(CONFIG_TOPDIR_PATH_HAS_SHA256SUM))
>> +SSH_CONFIG_SUFFIX:=$(CONFIG_TOPDIR_PATH_SHA256SUM)
>> +else
>> +SSH_CONFIG_SUFFIX:=$(CONFIG_KDEVOPS_HOST_PREFIX)
>> endif
>> +ANSIBLE_EXTRA_ARGS += kdevops_ssh_config=$(CONFIG_KDEVOPS_SSH_CONFIG)_kdevops_$(SSH_CONFIG_SUFFIX)
>
> Can we we just define this through Kconfig and use output yaml on the
> entry for CONFIG_KDEVOPS_SSH_CONFIG ? Appending variables together
> is stitched together on Kconfig via append-makefile-vars.sh.
>
> This may require either cleaning up the usage / definition of
> CONFIG_KDEVOPS_SSH_CONFIG and kdevops_ssh_config further so it is
> consistent.
Yeah, this is not the prettiest scripting in the world. I will try to
fix this up as I get through testing the other terraform providers.
--
Chuck Lever
next prev parent reply other threads:[~2025-02-06 2:36 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 ` [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 [this message]
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=4d44bfdc-ca44-47dc-9358-e737d3571179@oracle.com \
--to=chuck.lever@oracle.com \
--cc=cel@kernel.org \
--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