From patchwork Wed Feb 5 15:52:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13961406 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 E65AE1519BD for ; Wed, 5 Feb 2025 15:52:55 +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=1738770776; cv=none; b=ZfX/Mt1xYNzVNavCCowBQ3FZmsmDa+OUSN1F6J6ay6v7FQUSzi/x/ficgPCJSrnac5Y/IT09THNU0/cqx8RJzSWhOX7kwDCotvirbsRMjEWLz+2JlTTlhEMnJkdFEkDR5MhQVA+Sr+kJYRM6ckRHV+P1szKbaKDFnkgClAPlkGk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738770776; c=relaxed/simple; bh=GfzI0XVw+lQE71zhcecWZ+LVqFVvcIEUuKqkzzwr/Q8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YctwcNQv61sksjmVRIdHogfqRTGrcio5QXAprJ0q5fdKDhMt3A7dYuQCwcWORN8P0VFaxUE3M2F3vNTXCs9ZeCW0JMCwjCXW0AQL087QTqWQfpGkVJaczLMeMGG+dydJXA6guHXorNKGsMY9AtypxuBAeVeCiIr3LZGmS5f9a2o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=X0i9XuSy; 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="X0i9XuSy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2AC13C4CEE2; Wed, 5 Feb 2025 15:52:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738770775; bh=GfzI0XVw+lQE71zhcecWZ+LVqFVvcIEUuKqkzzwr/Q8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X0i9XuSyGiTskXV7hNFJ3ea05BgVsHk+RjTE/bNwgvYRM/RTS8qL1X+NJbOasSjuB 5NAD1YSV+5xE6Ry3+V9cLpdbadmc7qKoJFYgqOQ+4nf59QkukOiSia+OF7RSYLvs4Y 2jomFO5y2VMkDWTFoHckkwAQcIHjJ8mV1UOsvjZNTm2XYB+2JKrrS8r7GIGaQteRkT N3OYBmsqOcFWwVd/HxRn+U9ldUOMcxke99G7wBxwmiI1rXzmMwfSNOgRKw13CNE7yk LXUd6lRcgoLalPuaMUT63j+/JyBNDxQjjDZ03S0cuJ3bgYONFk9APrUdbvXly0tyHt INMStakRR+mBg== From: cel@kernel.org To: Cc: Chuck Lever Subject: [PATCH v2 01/12] guestfs: Rename the update_ssh_config_guestfs role Date: Wed, 5 Feb 2025 10:52:41 -0500 Message-ID: <20250205155252.1317763-2-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 The plan is to use this same mechanism for terraform as well. Rename the role with a generic name. Signed-off-by: Chuck Lever --- .../tasks/main.yml | 0 playbooks/update_ssh_config.yml | 4 ++++ playbooks/update_ssh_config_guestfs.yml | 4 ---- scripts/guestfs.Makefile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename playbooks/roles/{update_ssh_config_guestfs => update_ssh_config}/tasks/main.yml (100%) create mode 100644 playbooks/update_ssh_config.yml delete mode 100644 playbooks/update_ssh_config_guestfs.yml diff --git a/playbooks/roles/update_ssh_config_guestfs/tasks/main.yml b/playbooks/roles/update_ssh_config/tasks/main.yml similarity index 100% rename from playbooks/roles/update_ssh_config_guestfs/tasks/main.yml rename to playbooks/roles/update_ssh_config/tasks/main.yml diff --git a/playbooks/update_ssh_config.yml b/playbooks/update_ssh_config.yml new file mode 100644 index 000000000000..4c0315c24725 --- /dev/null +++ b/playbooks/update_ssh_config.yml @@ -0,0 +1,4 @@ +--- +- hosts: localhost + roles: + - role: update_ssh_config diff --git a/playbooks/update_ssh_config_guestfs.yml b/playbooks/update_ssh_config_guestfs.yml deleted file mode 100644 index 346b90245637..000000000000 --- a/playbooks/update_ssh_config_guestfs.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- hosts: localhost - roles: - - role: update_ssh_config_guestfs diff --git a/scripts/guestfs.Makefile b/scripts/guestfs.Makefile index 52397d54b89b..fb47bf21ab2f 100644 --- a/scripts/guestfs.Makefile +++ b/scripts/guestfs.Makefile @@ -64,7 +64,7 @@ $(KDEVOPS_PROVISIONED_SSH): $(Q)if [[ "$(CONFIG_KDEVOPS_SSH_CONFIG_UPDATE)" == "y" ]]; then \ ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ - playbooks/update_ssh_config_guestfs.yml \ + 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; \