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 035A7433A8 for ; Mon, 5 May 2025 09:07:38 +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=1746436059; cv=none; b=H+4QlWJdYNBUlj5LaLgWNM2bvepNr87SmfeY+vKxAMBFwB9L6ism46xOFUamQl3ZyMDWIt0zaKpqBOjy41Z/l753c5OHdQj4PbPhvxv7GyjE1E2yCd1o3rAPPFKG+lkXj2QFgCHYUr9ljW4r1d5LJrome43AlKPzwdwS5GRFIWY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746436059; c=relaxed/simple; bh=BoB4LMs3lduED+rl9kKk5D3C4EbiPwIT5ZoaYqaQqYU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=fR2+2iaCaA8x72l/bx7RLb/sIi57Bk4tYAg5Fs8IKahBszoYjpoazpXhlzc4w52aHs3grczwZeCGNdZbbt6p/6C7UW+rZq4IE7spkcgMV1Y0vsNC89W23H3T1KyEIb6AC0+qbyqpU7yEulfY02YB7iKQpnyip2HXoB96KPEMLlQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=W/+iAVxi; 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="W/+iAVxi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE844C4CEE4; Mon, 5 May 2025 09:07:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746436058; bh=BoB4LMs3lduED+rl9kKk5D3C4EbiPwIT5ZoaYqaQqYU=; h=From:To:Cc:Subject:Date:From; b=W/+iAVxilEf5m0yYULKcKQ8qyy/KSwX8ebWjFGuKE9jceA8ZjXAo/0YvQAEdN2VqN fyQU8bRV1IKj2x+pCIpVb3Wh22jfchRdEzYf7ds6Fwota5Q2rTDfrHYSiaRZqVUfCa QgJGALPuPFWmU2SB6T3OIMCh98TN3nu2mctR/6wy2TOrubb1w2LhBDQWhiV6rkApUF Tk/t4EnweHiHVethzdFsp6llCSFkDR/D5m7fdys4ucfKbKJWoOCTIlqBIk96XFUoYh OB0Ne92odKI+7dDNqje/BfwEMIyeRKjCXY/3Whs/mvWj9Zm4DgQJdy9PJko2yRU/34 ATYozSRq4dFsA== From: Chandan Babu R To: kdevops@lists.linux.dev Cc: Chandan Babu R , chuck.lever@oracle.com Subject: [PATCH V2 1/3] Set kdevops_terraform_ssh_config_privkey_file unconditionally Date: Mon, 5 May 2025 14:37:16 +0530 Message-ID: <20250505090724.955860-1-chandanbabu@kernel.org> X-Mailer: git-send-email 2.45.2 Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit kdevops_terraform_ssh_config_privkey_file is not set on control systems which use pre-existing ssh keys. Hence, adding entries of provisioned cloud instances to the ephemeral ssh config file fails on such systems. Fix this by setting kdevops_terraform_ssh_config_privkey_file unconditionally. Reviewed-by: Chuck Lever Signed-off-by: Chandan Babu R --- scripts/terraform.Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index 91469469..b6b26e69 100644 --- a/scripts/terraform.Makefile +++ b/scripts/terraform.Makefile @@ -85,10 +85,10 @@ endif # CONFIG_KDEVOPS_SSH_CONFIG_UPDATE export KDEVOPS_SSH_PUBKEY:=$(shell realpath $(subst ",,$(CONFIG_TERRAFORM_SSH_CONFIG_PUBKEY_FILE))) TERRAFORM_EXTRA_VARS += kdevops_terraform_ssh_config_pubkey_file='$(KDEVOPS_SSH_PUBKEY)' TERRAFORM_EXTRA_VARS += kdevops_terraform_ssh_config_user='$(SSH_CONFIG_USER)' +TERRAFORM_EXTRA_VARS += kdevops_terraform_ssh_config_privkey_file='$(basename $(KDEVOPS_SSH_PUBKEY))' ifeq (y,$(CONFIG_TERRAFORM_SSH_CONFIG_GENKEY)) export KDEVOPS_SSH_PRIVKEY:=$(basename $(KDEVOPS_SSH_PUBKEY)) -TERRAFORM_EXTRA_VARS += kdevops_terraform_ssh_config_privkey_file='$(KDEVOPS_SSH_PRIVKEY)' ifeq (y,$(CONFIG_TERRAFORM_SSH_CONFIG_GENKEY_OVERWRITE)) DEFAULT_DEPS += remove-ssh-key -- 2.45.2