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 E8507433A8 for ; Mon, 5 May 2025 09:07:44 +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=1746436065; cv=none; b=NCjvtSfAj2uboDwAdzU7Rfwoor6XQ8z79HH1ZVrFtedNA/g2EmJt9sH4WmeeiVD5KnwwCsEtvGszhnK71AIrZ/k2RN/Smm+TFbM5Z9Lu6AsDOE331EilWNzzGALl6mo0Kg2Ye7sTEGXKhyNwDMHwAD26eAHtMWL3rRke12Ix6Ls= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746436065; c=relaxed/simple; bh=G6lXXdauz26PGKgU19ftBN/DI+16oOxWojPjI1tQYpE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hUn8S2VDfHSdSJzJQnAmfMuxOiyLlnveBSz9yf8xykNnKTVJha1wDS74Hs425JPxNumCvM2S2Z4IZpU0pUHE2XkQVrGYWv6pt1HbkEEKgT0w9S4FNzL3PbeksCDQpS9SQAnX9wKXfjAiBeT89kQn4L1/FF9AYjF0X8JoHeBdKc8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=o2Dar2Xo; 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="o2Dar2Xo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6546C4CEE4; Mon, 5 May 2025 09:07:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746436064; bh=G6lXXdauz26PGKgU19ftBN/DI+16oOxWojPjI1tQYpE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o2Dar2Xo1jZ6OLVJ7wlmp1WZXmAGWqgimWirhOghQtioyVscDUyeLUaDtrRm75ul/ wfEclIhrcql0hHfOzkUmcG0WJkVY68jtbPBq5F1mq0gzss1sVf0DUJeL+UY3bIrIva kbMr0mGgIWiOKfZoJ5qeHRRrW74NLJLa+y5+XbLV2UtsN7RbW23xMLaL/JI2D+TsYU 3zIZWYmoRMrBTgMsbsYHepCGC6TESx8zj0pFBsMbNWdHwpmbaLBY1/Zx/UBn9o4jCR LTnkI7I1Bd++209S5zANCkgTN6Cb8APkijCVUD5lRUUxelzLeSJkgdlzy9iiyk6c2h TefS7Z1c8Z88Q== From: Chandan Babu R To: kdevops@lists.linux.dev Cc: Chandan Babu R , chuck.lever@oracle.com Subject: [PATCH V2 2/3] Remove kdevops_terraform_ssh_config_genkey_overwrite Date: Mon, 5 May 2025 14:37:17 +0530 Message-ID: <20250505090724.955860-2-chandanbabu@kernel.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250505090724.955860-1-chandanbabu@kernel.org> References: <20250505090724.955860-1-chandanbabu@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Adding entries to the ephemeral ssh config file on control systems is being done only when kdevops_terraform_ssh_config_genkey_overwrite evaluates to true. This is incorrect because we need to allow Kdevops to be used with pre-existing ssh keys. Hence remove the conditions in playbooks/roles/terraform/defaults/main.yml which check the value of kdevops_terraform_ssh_config_genkey_overwrite. Also, the value of kdevops_terraform_ssh_config_genkey_overwrite is not checked in any other file. Hence this commit removes the remaining instances of this variable. Reviewed-by: Chuck Lever Signed-off-by: Chandan Babu R --- playbooks/roles/terraform/defaults/main.yml | 1 - playbooks/roles/terraform/tasks/main.yml | 8 -------- scripts/terraform.Makefile | 1 - 3 files changed, 10 deletions(-) diff --git a/playbooks/roles/terraform/defaults/main.yml b/playbooks/roles/terraform/defaults/main.yml index f3ef9b18..33bd00e6 100644 --- a/playbooks/roles/terraform/defaults/main.yml +++ b/playbooks/roles/terraform/defaults/main.yml @@ -1,3 +1,2 @@ --- ssh_config_kexalgorithms: "" -kdevops_terraform_ssh_config_genkey_overwrite: false diff --git a/playbooks/roles/terraform/tasks/main.yml b/playbooks/roles/terraform/tasks/main.yml index 272ebf93..d04dc997 100644 --- a/playbooks/roles/terraform/tasks/main.yml +++ b/playbooks/roles/terraform/tasks/main.yml @@ -15,8 +15,6 @@ cmd: "terraform output -json public_ip_map" register: terraform_output changed_when: false - when: - - kdevops_terraform_ssh_config_genkey_overwrite|bool tags: - ssh @@ -25,8 +23,6 @@ run_once: true ansible.builtin.set_fact: public_ip_map: "{{ terraform_output.stdout | from_json }}" - when: - - kdevops_terraform_ssh_config_genkey_overwrite|bool tags: - ssh @@ -40,8 +36,6 @@ insertafter: "EOF" marker: "# {mark} host configuration for {{ inventory_hostname }}" mode: "u=rw,g=r,o=r" - when: - - kdevops_terraform_ssh_config_genkey_overwrite|bool tags: - ssh @@ -55,8 +49,6 @@ marker: "# {mark} Managed by kdevops" mode: "u=rw,g=r,o=r" block: "Include {{ kdevops_ssh_config_prefix }}*" - when: - - kdevops_terraform_ssh_config_genkey_overwrite|bool tags: - ssh diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index b6b26e69..865c84c3 100644 --- a/scripts/terraform.Makefile +++ b/scripts/terraform.Makefile @@ -92,7 +92,6 @@ export KDEVOPS_SSH_PRIVKEY:=$(basename $(KDEVOPS_SSH_PUBKEY)) ifeq (y,$(CONFIG_TERRAFORM_SSH_CONFIG_GENKEY_OVERWRITE)) DEFAULT_DEPS += remove-ssh-key -TERRAFORM_EXTRA_VARS += kdevops_terraform_ssh_config_genkey_overwrite='True' endif DEFAULT_DEPS += $(KDEVOPS_SSH_PRIVKEY) -- 2.45.2