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 7A9CF320F for ; Fri, 2 May 2025 06:46:30 +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=1746168390; cv=none; b=uPf9uU8Kar921Li6BhkCYa9iNVrgtgNHf+wQ7n9gLVqTRaysiZXu3X0PnEhXZ6OFfMqDz4oTzDj0KUv0EBG4N/eDAyb5HKqhcWUpS+fcfEcIIMi2jtWjksaZDfUol/nqBHTX+Jr3JQdXILCSzRpQ2R4EUiKRzAaQuwQOBhDCAfE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746168390; c=relaxed/simple; bh=PFq1SAVZ8nb4sSb6rdZ79Br5GXQSP7B1ZezisCX+iNU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=JCDnyURJNlWWaE8TEWczLvLeNwsV6aZvGwGqt+ER577qep3rF7hcfPRKmkuLf7KlSSMVDxE6pEKz8lSybIt8CgQrIgAuMKQj+7VDvf+u3zSjF1iApIxPN/BeZtm8MVCgzL79B5zTQyfj2uJSVNmZ1kXVjBGxcjoMw2qy7Jz71wo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=r5OLeI7E; 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="r5OLeI7E" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5D19DC4CEE4; Fri, 2 May 2025 06:46:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746168390; bh=PFq1SAVZ8nb4sSb6rdZ79Br5GXQSP7B1ZezisCX+iNU=; h=From:To:Cc:Subject:Date:From; b=r5OLeI7EEOeYjJ1gBua+VhMSQRq/7kbZjj32zaku1nGHO1tVBxdRy1bZid4/kaDTQ 9KV26lVy9deyUchGB6vqwvoazhNBk429WNvL8fry+urWz3ifOwqbe1HBRxUcfwn2Aa a0hz9Cdt51tOmV91FAEPq55ti9tDyq0ypSZkNfPTVYp0WpB7LG3AlVIhwkpsKN1CN2 u0nMYqLN4oydcJwJyV2+032oi/9lzNbAwyTTTdBwSdLYyaowLXhJGd/j6vwR8T6mI9 ujl9/EAze9h0YzrdHXYv5Xw5JjYHMCZyxqvhWyiqdUTRQlk/4YD+Ymx8EIxSVE9Jxh OQgx6xL4Kp9dw== From: Chandan Babu R To: kdevops@lists.linux.dev Cc: Chandan Babu R , chuck.lever@oracle.com Subject: [PATCH 1/3] Set kdevops_terraform_ssh_config_privkey_file unconditionally Date: Fri, 2 May 2025 12:16:04 +0530 Message-ID: <20250502064609.922565-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. 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