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 9F9C61EDA26 for ; Mon, 24 Feb 2025 19:12:20 +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=1740424340; cv=none; b=S2mP8uMj7tq2gp4XiK9al9cpjQe89uMoWlHLZVFysdeMmWP1rSeFsJRj/GPSo5hz99oX7ndAqRcIEgMNcAKPqC/GWBHfyeYXxN1m8UfaJXuobsQwJTQFYzGHnAssgD4WVeimt+dHFIvzdZxbxnUIo8BAWmptEBPGlBkB0C/ZUUc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740424340; c=relaxed/simple; bh=0pZFBRGP0YFsIb+KH1Kc3AKpr5J8BIRRorl3/60knko=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lxB0zATTWNB9Y3HujTrezwStM0TMPxXk0batTbf7nva8tsaYaZC1FoZoOaIhQpgkGvRGNkQ7IiOv/wwx96+GfzhEzDWCfaqDPQec6WfjOTsDLbbPLrSxzCHRyhqg/2Js8aEpxqSuzy5j7vQ2Nt1QbHZ42ynM67uKxB1CIDkPpuU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XXZy9jH0; 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="XXZy9jH0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DB2C3C4CED6; Mon, 24 Feb 2025 19:12:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740424340; bh=0pZFBRGP0YFsIb+KH1Kc3AKpr5J8BIRRorl3/60knko=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XXZy9jH0A4TMmdfbn+I3JikjXIJg9IA6/RgtAc+T2t/e0m9em752pSlXMXeSG27X+ mzhkN12yl+A+bqvM8pmDnv37CR7IxYpXV2YTsUFgvkX6qJTo0uq0GeKAKXhQih2F28 U9Oq/Fs/ptlGU6TzZQ1iGwNM9IhbpiceBzO3YgK+KyW/2kaB3eaBSpxWsOgYBuAhL4 XgGyIFb9ludUatbPmtth2JuKP2a4RcTgLuY36ZcaZaSpCm2QHOFWj1y2d0Ek5RufTD El8RHJMOqn5oukPUX3kHqWIWe+C577rPzScrbEod9UIcrFX0Fakfabnw07qy9SbEZL nIgvm7SsgG8rQ== From: cel@kernel.org To: Cc: Chuck Lever Subject: [PATCH v3 3/6] terraform: Clean up ssh configuration during "make destroy" Date: Mon, 24 Feb 2025 14:12:12 -0500 Message-ID: <20250224191215.637818-4-cel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250224191215.637818-1-cel@kernel.org> References: <20250224191215.637818-1-cel@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 From: Chuck Lever Signed-off-by: Chuck Lever --- playbooks/roles/terraform/tasks/main.yml | 9 +++++++++ scripts/terraform.Makefile | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/playbooks/roles/terraform/tasks/main.yml b/playbooks/roles/terraform/tasks/main.yml index e328ea7bc0b2..31c97fdb78b1 100644 --- a/playbooks/roles/terraform/tasks/main.yml +++ b/playbooks/roles/terraform/tasks/main.yml @@ -16,3 +16,12 @@ force_init: true tags: - destroy + +- name: Remove the ephemeral ssh config file on the control host + delegate_to: localhost + run_once: true + ansible.builtin.file: + path: "{{ kdevops_ssh_config }}" + state: absent + tags: + - destroy diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index 2436571a4aac..f22538721a55 100644 --- a/scripts/terraform.Makefile +++ b/scripts/terraform.Makefile @@ -176,7 +176,7 @@ destroy_terraform: playbooks/terraform.yml --tags destroy \ --extra-vars=@./extra_vars.yaml \ -e 'ansible_python_interpreter=/usr/bin/python3' - $(Q)rm -f $(KDEVOPS_PROVISIONED_DEVCONFIG) + $(Q)rm -f $(KDEVOPS_PROVISIONED_SSH) $(KDEVOPS_PROVISIONED_DEVCONFIG) $(KDEVOPS_TFVARS): $(KDEVOPS_TFVARS_TEMPLATE) .config $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ -- 2.48.1