From patchwork Fri Jan 31 20:19:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13955733 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 30C94482EB for ; Fri, 31 Jan 2025 20:19: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=1738354779; cv=none; b=YOozuTChMWgQOPsV16h9rtkDI8GzMcUh0p8UJhJoU8ZcKvTYct3czqZEf0sWwuZ5I09HqGMvWCdLkSCZAxTb+SGjOFubIzBj1CWU9yV7JpfRyKVdHfDgdyr6Fj0qVrso4Hmgw8JvfibbtWI2iuOrCD5RGGMg0jEVoNhEBnH7Br0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738354779; c=relaxed/simple; bh=sztP2b8jFH24uMDTxaJAc/gmAuYSeP0atPRS3oJwkzM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EA3z1vPzAbj8S+O7+KJWazNaB8RSm34Pfh5ZuswcTbxpmH8hKyx7DEGrgnetAoWcLDed5ovVq2LziUWvUknR99phaPmB6ZwNoi2I/X8598pHOpr4LT7uEqAPul3C+mMCyGWcj8V1scvxkR1n8UPq6widmOqoSVQCqb9rm6S8kPE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gOggW1/u; 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="gOggW1/u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68215C4CEE2; Fri, 31 Jan 2025 20:19:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738354778; bh=sztP2b8jFH24uMDTxaJAc/gmAuYSeP0atPRS3oJwkzM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gOggW1/uIkRE4MiNzhJl2mEZWdRZCmlbKR+eK54Oxmb9wqoFINMz5Uhe8JoqLAdBQ 2QQYkdBfNu9ujTXdzCWGfC+SnM4Q2+8qY5W1NtFcBe9MvcpFcYKOoUG8nsZ+puvvxZ mOinPFp76/AexbLAP6OwS1lY2pQgFDUox4uWW4/svtyANkA6uOWVbv8L7Z8SsTIrZx tI9x5VJ+xBIrUZqyMBJnEAab7daYi1cAQ3cPquXMWYu9N/22lwPjU1XBZpzIQ95UuL KbXYC307+YINodxfTDigWEoIQOgvb99AjJM28a+qpafkteJwK1a3LHlPm9Z4CxJAAU Z8EnIcC7JrNVA== From: cel@kernel.org To: Cc: Chuck Lever Subject: [RFC PATCH 4/4] terraform: Remove the terrraform update_ssh_config module Date: Fri, 31 Jan 2025 15:19:32 -0500 Message-ID: <20250131201932.449083-5-cel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250131201932.449083-1-cel@kernel.org> References: <20250131201932.449083-1-cel@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chuck Lever The add_ssh_hosts_terraform playbook has taken its place. XXX: Need to add a public_ip_map output for all cloud providers before removing the update_ssh_config terraform module. Signed-off-by: Chuck Lever --- Makefile | 1 + terraform/aws/output.tf | 25 ------------------------ terraform/aws/update_ssh_config.tf | 1 - terraform/azure/update_ssh_config.tf | 1 - terraform/gce/update_ssh_config.tf | 1 - terraform/oci/update_ssh_config.tf | 1 - terraform/openstack/update_ssh_config.tf | 1 - terraform/update_ssh_config.tf | 17 ---------------- 8 files changed, 1 insertion(+), 47 deletions(-) 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 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 diff --git a/Makefile b/Makefile index a0441b2c7bb8..e0e5d8f962d2 100644 --- a/Makefile +++ b/Makefile @@ -252,6 +252,7 @@ mrproper: $(Q)$(MAKE) -f scripts/build.Makefile $@ $(Q)rm -f $(KDEVOPS_DEPCHECK) $(Q)rm -f terraform/*/terraform.tfvars + $(Q)rm -rf terraform/*/.terraform $(Q)rm -f $(KDEVOPS_NODES) $(Q)rm -f $(KDEVOPS_HOSTFILE) $(KDEVOPS_MRPROPER) $(Q)rm -f .config .config.old extra_vars.yaml $(KCONFIG_YAMLCFG) diff --git a/terraform/aws/output.tf b/terraform/aws/output.tf index cb8cab4afcdd..83a85a388055 100644 --- a/terraform/aws/output.tf +++ b/terraform/aws/output.tf @@ -1,30 +1,5 @@ # All generic output goes here -locals { - ssh_key_i = format( - " %s%s ", - var.ssh_config_pubkey_file != "" ? "-i " : "", - var.ssh_config_pubkey_file != "" ? replace(var.ssh_config_pubkey_file, ".pub", "") : "", - ) -} - -data "null_data_source" "group_hostnames_and_ips" { - count = local.kdevops_num_boxes - inputs = { - value = format( - "%30s : ssh %s@%s %s ", - element(var.kdevops_nodes, count.index), - var.ssh_config_user, - element(aws_eip.kdevops_eip.*.public_ip, count.index), - local.ssh_key_i, - ) - } -} - -output "login_using" { - value = data.null_data_source.group_hostnames_and_ips.*.outputs -} - # Each provider's output.tf needs to define a public_ip_map. This # map is used to build the Ansible controller's ssh configuration. # Each map entry contains the node's hostname and public IP address. diff --git a/terraform/aws/update_ssh_config.tf b/terraform/aws/update_ssh_config.tf deleted file mode 120000 index 03cd77a65841..000000000000 --- a/terraform/aws/update_ssh_config.tf +++ /dev/null @@ -1 +0,0 @@ -../update_ssh_config.tf \ No newline at end of file diff --git a/terraform/azure/update_ssh_config.tf b/terraform/azure/update_ssh_config.tf deleted file mode 120000 index 03cd77a65841..000000000000 --- a/terraform/azure/update_ssh_config.tf +++ /dev/null @@ -1 +0,0 @@ -../update_ssh_config.tf \ No newline at end of file diff --git a/terraform/gce/update_ssh_config.tf b/terraform/gce/update_ssh_config.tf deleted file mode 120000 index 03cd77a65841..000000000000 --- a/terraform/gce/update_ssh_config.tf +++ /dev/null @@ -1 +0,0 @@ -../update_ssh_config.tf \ No newline at end of file diff --git a/terraform/oci/update_ssh_config.tf b/terraform/oci/update_ssh_config.tf deleted file mode 120000 index 03cd77a65841..000000000000 --- a/terraform/oci/update_ssh_config.tf +++ /dev/null @@ -1 +0,0 @@ -../update_ssh_config.tf \ No newline at end of file diff --git a/terraform/openstack/update_ssh_config.tf b/terraform/openstack/update_ssh_config.tf deleted file mode 120000 index 03cd77a65841..000000000000 --- a/terraform/openstack/update_ssh_config.tf +++ /dev/null @@ -1 +0,0 @@ -../update_ssh_config.tf \ No newline at end of file diff --git a/terraform/update_ssh_config.tf b/terraform/update_ssh_config.tf deleted file mode 100644 index 03f0cbed424a..000000000000 --- a/terraform/update_ssh_config.tf +++ /dev/null @@ -1,17 +0,0 @@ -module "ssh_config_update_host_entries" { - source = "linux-kdevops/add-host-ssh-config/kdevops" - version = "3.0.0" - - ssh_config = var.ssh_config - update_ssh_config_enable = var.ssh_config_update - cmd = "update" - shorthosts = join(",", slice(local.shorthosts, 0, local.kdevops_num_boxes)) - hostnames = join(",", slice(local.ipv4s, 0, local.kdevops_num_boxes)) - ports = "22" - user = var.ssh_config_user == "" ? "" : var.ssh_config_user - id = replace(var.ssh_config_pubkey_file, ".pub", "") - strict = var.ssh_config_use_strict_settings ? "true" : "" - use_backup = !var.ssh_config_backup || var.ssh_config == "/dev/null" ? "" : "true" - backup_postfix = "kdevops" - kexalgorithms = var.ssh_config_kexalgorithms == "" ? "" : var.ssh_config_kexalgorithms -}