From patchwork Wed Feb 5 15:52:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13961409 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 29EA918FDA5 for ; Wed, 5 Feb 2025 15:52:57 +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=1738770777; cv=none; b=OhXJwiCn8JREgtzccMwgPrBKFP77E/vD6jBVLlIijkaEfwx0rDimbS0Zw0BAts1MMSdcW249sEBVK0n2R/HemntyXMq2RYeMTcbF5CzimfqhDkCqE3GtnAQ6JJXjMfIUlaUtaRPyKr3xifWC2Im2qmwyXT2X/JflTz5ih5/QP5A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738770777; c=relaxed/simple; bh=6M8oV2RpvQx7gYqdVc979UWWHa9fSF0FIgtwIFbWmNc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f/eDnlJ3nJcY3ULPwUf8CLFuQE1HGIv8uU0s9TdorMSkA6QW0KRifAHs3x5jz6FJXcoDuRLQh1Sao2tyBMce1u/KvB0XeY97bVacKlnkNIDGo+0TqBiw0MLIhyfvcKRfh2cUREVB0isd5pd9nj89YEhGigOxRGWoGB9XkaxIrKY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pLeaC1/N; 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="pLeaC1/N" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE83DC4CED6; Wed, 5 Feb 2025 15:52:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738770777; bh=6M8oV2RpvQx7gYqdVc979UWWHa9fSF0FIgtwIFbWmNc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pLeaC1/NE8RF84hZj9uTiTZD6aAyJHF7YeiLZ+cvUSM3nBDtS/V4+CYiCyVCXD25W yDhWiktmueBq6oyQvkBvk7LEAZ3T7yFx37PkCXgJsxmMYYEVukCu6j56pE3gLxewx9 RyQx/OowMZqNhwyoUrGnq6afu9wBr+dlnNZ3J/bPsKCbiyhscVrzmR4t1J8uQ0+w0P VEQAa8jI38IPBOjuWykfWnbAiSDKu8eLstEtikcpx1+TRsZy0VkC7aPcbYkdF7md6g XKnRpr3nCVTFQ67TiSIBFjiaISYrJEDG/IQXntCYSAO/uwqxf9YQQwFB9mXeHjEk2H oIIR6b6HE2FXg== From: cel@kernel.org To: Cc: Chuck Lever Subject: [PATCH v2 04/12] update_ssh_config: Run update_ssh_config during "make deps" Date: Wed, 5 Feb 2025 10:52:44 -0500 Message-ID: <20250205155252.1317763-5-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 From: Chuck Lever This situates the Include directive into the controller's .ssh/config for all virtualization methods. Signed-off-by: Chuck Lever --- scripts/guestfs.Makefile | 5 ----- scripts/ssh.Makefile | 12 ++++++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/scripts/guestfs.Makefile b/scripts/guestfs.Makefile index fb47bf21ab2f..5a75889ec148 100644 --- a/scripts/guestfs.Makefile +++ b/scripts/guestfs.Makefile @@ -62,11 +62,6 @@ libvirt_pcie_passthrough_permissions: $(KDEVOPS_PROVISIONED_SSH): $(Q)if [[ "$(CONFIG_KDEVOPS_SSH_CONFIG_UPDATE)" == "y" ]]; then \ - ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ - --inventory localhost, \ - playbooks/update_ssh_config.yml \ - --extra-vars=@./extra_vars.yaml \ - -e 'ansible_python_interpreter=/usr/bin/python3' ;\ LIBVIRT_DEFAULT_URI=$(CONFIG_LIBVIRT_URI) $(TOPDIR)/scripts/update_ssh_config_guestfs.py; \ fi $(Q)ansible $(ANSIBLE_VERBOSE) -i hosts all -e 'ansible_python_interpreter=/usr/bin/python3' -m wait_for_connection diff --git a/scripts/ssh.Makefile b/scripts/ssh.Makefile index 3ee9437b1b4c..cf79a1dd6c27 100644 --- a/scripts/ssh.Makefile +++ b/scripts/ssh.Makefile @@ -21,3 +21,15 @@ $(KDEVOPS_SSH_PRIVKEY): .config $(NQ) Generating new private key: $(KDEVOPS_SSH_PRIVKEY) $(NQ) Generating new public key: $(KDEVOPS_SSH_PUBKEY) $(Q)$(TOPDIR)/scripts/gen_ssh_key.sh + +PHONY += update-ssh-config +update-ssh-config: + $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ + --inventory localhost, \ + playbooks/update_ssh_config.yml \ + --extra-vars=@./extra_vars.yaml \ + -e 'ansible_python_interpreter=/usr/bin/python3' + +ifeq (y,$(CONFIG_KDEVOPS_SSH_CONFIG_UPDATE)) +LOCALHOST_SETUP_WORK += update-ssh-config +endif