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 A51A118FDDB for ; Wed, 5 Feb 2025 15:52:59 +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=1738770779; cv=none; b=BY9wjL/GKAitAgIl/jPSKvyKbJxj7Cf4NYEnXEi8woCQl72kGdDo4jvT7cU2BVYY1D7Yrc3qOLj7xYgf+M7i4ycFolkrk/XfYyQXpTSHAQcl7ZRsIS7D46PTGnmPBAiv6xmd5THm+DgMmmQGQuw+yZ/cgZaVZHgi0WqcNBKl808= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738770779; c=relaxed/simple; bh=oPTrPCY1FaMrbVa1wbJYqudLqQbJXhyt+uzzcB1fF7A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P/wVrKjNQusMD0KQhrEVEY+2ldNEejH1jtd2D+W4hQcX4YHVE/TunyVXBF9yzXnZuV8tBq7D8eHMAJcREC0jqw8PkVTAF9g3TCD3cd7kVCqiOXaFi5gBXvwmyctylc0RDE3dioUaW5ojh2oP3p9RsnfztEIlng72UGTvNj1kS14= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gqmcA5NP; 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="gqmcA5NP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43443C4CED1; Wed, 5 Feb 2025 15:52:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738770779; bh=oPTrPCY1FaMrbVa1wbJYqudLqQbJXhyt+uzzcB1fF7A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gqmcA5NPhggWZ6uFVhURNlYtNQ56V2JmPeJG2d9ft1dJyc2TWyGClsisSDh2+Hdpz xsAg2cYa9ozqAFQAJnMJ4JeIG+a7GaUzxXh4ujPBrUWEgv9sqxLUzl2M9uOuubofco V8BWba+XypBK2NiFhtqalLf9Nz5g6u0cOW53PoNEBUyhCU9qX6jD+rgIFwTGakgFhE 20AFDolq3lNk+tToFqQoYSDcNGrYXnRNDcvy6QYwtcjFOcimY+Zop3eXDXeLMHpTKH UezNakSZqySyWEdO1MJ2p/jqxBBy2oV3g355/y6sUV2xos3KumX6TCAAPZB7qKPhKl ANSB/78BPPePg== From: cel@kernel.org To: Cc: Chuck Lever Subject: [PATCH v2 09/12] update_ssh_config: Add always-run ssh clean-up steps Date: Wed, 5 Feb 2025 10:52:49 -0500 Message-ID: <20250205155252.1317763-10-cel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205155252.1317763-1-cel@kernel.org> References: <20250205155252.1317763-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 This common bit of logic is now run by the "make destroy" target in order that it affects all virtualization methods. Signed-off-by: Chuck Lever --- .../roles/update_ssh_config/tasks/main.yml | 24 +++++++++++++++++++ scripts/bringup.Makefile | 6 +++++ scripts/destroy_guestfs.sh | 6 ----- scripts/guestfs.Makefile | 1 - scripts/terraform.Makefile | 1 - 5 files changed, 30 insertions(+), 8 deletions(-) diff --git a/playbooks/roles/update_ssh_config/tasks/main.yml b/playbooks/roles/update_ssh_config/tasks/main.yml index 72c5f2e365f5..781d70fbaf53 100644 --- a/playbooks/roles/update_ssh_config/tasks/main.yml +++ b/playbooks/roles/update_ssh_config/tasks/main.yml @@ -62,3 +62,27 @@ mode: "u=rw,g=r,o=r" block: | Include {{ sshdir }}/config_kdevops_* + +- name: Remove saved keys for the target nodes + tags: destroy + throttle: 1 + ansible.builtin.command: + argv: + - "ssh-keygen" + - "-q" + - "-f" + - "{{ sshdir }}/known_hosts" + - "-R" + - "{{ inventory_hostname }}" + register: result + failed_when: false + changed_when: + - result is success + - not "not found in" in result.stderr + +- name: Remove the ephemeral ssh config file on the control host + tags: destroy + run_once: true + ansible.builtin.file: + path: "{{ kdevops_ssh_config }}" + state: absent diff --git a/scripts/bringup.Makefile b/scripts/bringup.Makefile index 148547c0644a..a19cffa39cae 100644 --- a/scripts/bringup.Makefile +++ b/scripts/bringup.Makefile @@ -23,6 +23,12 @@ endif bringup: $(KDEVOPS_BRING_UP_DEPS) destroy: $(KDEVOPS_DESTROY_DEPS) + $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ + --inventory localhost, --tags destroy \ + playbooks/update_ssh_config.yml \ + --extra-vars=@./extra_vars.yaml \ + -e 'ansible_python_interpreter=/usr/bin/python3' \ + $(Q)rm -f $(KDEVOPS_PROVISIONED_SSH) $(KDEVOPS_PROVISIONED_DEVCONFIG) bringup-help-menu: @echo "Bringup targets:" diff --git a/scripts/destroy_guestfs.sh b/scripts/destroy_guestfs.sh index 58dca78d85cf..dd32e7398365 100755 --- a/scripts/destroy_guestfs.sh +++ b/scripts/destroy_guestfs.sh @@ -23,14 +23,8 @@ if [ -f "$GUESTFSDIR/kdevops_nodes.yaml" ]; then fi rm -rf "$GUESTFSDIR/$name" rm -rf "$STORAGEDIR/$name" - ssh-keygen -q -f ~/.ssh/known_hosts -R $name 1> /dev/null 2>&1 done fi -if [[ "$CONFIG_TOPDIR_PATH_HAS_SHA256SUM" == "y" ]]; then - rm -f ~/.ssh/config_kdevops_$CONFIG_TOPDIR_PATH_SHA256SUM -else - rm -f ~/.ssh/config_kdevops_$CONFIG_KDEVOPS_HOSTS_PREFIX -fi rm -f $GUESTFSDIR/.provisioned_once rm -f $GUESTFSDIR/kdevops_nodes.yaml diff --git a/scripts/guestfs.Makefile b/scripts/guestfs.Makefile index 5a75889ec148..5a86c3def412 100644 --- a/scripts/guestfs.Makefile +++ b/scripts/guestfs.Makefile @@ -85,7 +85,6 @@ PHONY += bringup_guestfs destroy_guestfs: $(Q)$(TOPDIR)/scripts/destroy_guestfs.sh - $(Q)rm -f $(KDEVOPS_PROVISIONED_SSH) $(KDEVOPS_PROVISIONED_DEVCONFIG) PHONY += destroy_guestfs diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index 888d3af88e3e..b4543d2561fb 100644 --- a/scripts/terraform.Makefile +++ b/scripts/terraform.Makefile @@ -168,7 +168,6 @@ bringup_terraform: destroy_terraform: $(Q)$(TOPDIR)/scripts/destroy_terraform.sh - $(Q)rm -f $(KDEVOPS_PROVISIONED_DEVCONFIG) $(KDEVOPS_TFVARS): $(KDEVOPS_TFVARS_TEMPLATE) .config $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ -- 2.48.1