From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 ED81316F824 for ; Wed, 4 Sep 2024 23:30:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725492643; cv=none; b=fwAs4OeoNhn9pQIetbaic4MKLzVjpu6bmpKvql9dnmxBSmN/f61Y14q20eLZD9hS7aJYweaSh+usoVVp33Kx1uNly63y3vYNjA9bo3Ii41rSDwToXIwjcJW9P63cNv/POCecxyEOwosdGyQYNjg3DthxUu6oiwi1XDk/75JZMb4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725492643; c=relaxed/simple; bh=Y84TeoXYVoGtBHHom3VsDLRY8+M7M6JEgK44JOQFLog=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O8K2ZpQcU9BdK9L/CZ715aaWaJjRBipKntbNyAf/prX7n3IALprcU6h+rPIrvJwiGQl1B2iPZSy2dyztKCOCVAynFg6WX7IfIG8ZxbswWpbHcau9nTcpLvs15BOleHYZg1v7x6jQPqAG7+8WQ22sy/ESIyDLlV8LSyHhWuuRsKg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=dSZHDTBS; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="dSZHDTBS" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=k8JggZmDZ0WD00jN+w3tW0Xrq26hbVeIXu+myURm33c=; b=dSZHDTBSb56p7LddkLxaDYooxs qiE/LlyabEzjBVzEvvK5fYaEgEMQ3rzlkdHKunYXZiakIwkiXH3Y4srr4yMZHOK3D6Goegy3IB/8U zkZJR4yjcRF3TjnSY9v/Z4MwImzWQ6s1d3AVSfTx92uIV7bhkECLw2+bwCbDwkmfDqFVlGcwW61BK FqMHKhUcjrzo4Aw0WTDa1Bp1f16F/XGIxtufN6hjUd5ZN7jXzoStdzStHMiAWA+W3W5CgJhyooaGa p915JUaNYR8w+vJKdP27SIbNwMDMLviN7Jw/OlCnMuE7IxQsoCbl1GrFVkRBGUtKS5vxlDZqhh/Oa zYZx0H8A==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1slzST-00000006MSJ-0Nze; Wed, 04 Sep 2024 23:30:41 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev, chuck.lever@oracle.com, da.gomez@samsung.com, jlayton@kernel.org Cc: mcgrof@kernel.org Subject: [PATCH 3/5] scripts/ssh.Makefile: remove Makefile appending of KDEVOPS_HOSTS_PREFIX Date: Wed, 4 Sep 2024 16:30:38 -0700 Message-ID: <20240904233040.1516250-4-mcgrof@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240904233040.1516250-1-mcgrof@kernel.org> References: <20240904233040.1516250-1-mcgrof@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 Sender: Luis Chamberlain We have CONFIG_KDEVOPS_HOSTS_PREFIX but have two respective ansible variable: * kdevops_host_prefix * kdevops_hosts_prefix We need to keep these for now to ensure old configs work and so existing extra_vars.yaml continue to work. We at least annotate these for future unification into a release where folks are not going to use the old symbols on existing running environments. We can later look for these with: git grep ^"# old-yamlconfig-compat" Signed-off-by: Luis Chamberlain --- kconfigs/Kconfig.kdevops | 7 +++++++ scripts/gen-hosts.Makefile | 1 - scripts/ssh.Makefile | 3 --- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/kconfigs/Kconfig.kdevops b/kconfigs/Kconfig.kdevops index 80434b2b97ad..c613ff20c193 100644 --- a/kconfigs/Kconfig.kdevops +++ b/kconfigs/Kconfig.kdevops @@ -57,6 +57,7 @@ config KDEVOPS_HOSTS_PREFIX_SET_BY_CLI config KDEVOPS_HOSTS_PREFIX string "The hostname prefix to use for nodes" + output yaml default $(shell, ./scripts/append-makefile-vars.sh $(KDEVOPS_HOSTS_PREFIX)) if KDEVOPS_HOSTS_PREFIX_SET_BY_CLI default "kdevops" if !KDEVOPS_USE_DISTRO_HOSTS_PREFIX && !KDEVOPS_HOSTS_PREFIX_SET_BY_CLI default CUSTOM_DISTRO_HOST_PREFIX if KDEVOPS_USE_DISTRO_HOSTS_PREFIX && !KDEVOPS_HOSTS_PREFIX_SET_BY_CLI @@ -65,6 +66,12 @@ config KDEVOPS_HOSTS_PREFIX help distinguish projects / goals for a set of nodes. You can use this to override the hostname prefix used. +# old-yamlconfig-compat +config KDEVOPS_HOST_PREFIX + string + output yaml + default KDEVOPS_HOSTS_PREFIX + config KDEVOPS_CUSTOM_SSH_KEXALGORITHMS string "The custom ssh config KexAlgorithms string to use" depends on HAVE_DISTRO_REQUIRES_CUSTOM_SSH_KEXALGORITHMS diff --git a/scripts/gen-hosts.Makefile b/scripts/gen-hosts.Makefile index b4f7b730b3e8..0b8e4261069c 100644 --- a/scripts/gen-hosts.Makefile +++ b/scripts/gen-hosts.Makefile @@ -17,7 +17,6 @@ GENHOSTS_EXTRA_ARGS += kdevops_hosts_template_full_path='$(KDEVOPS_HOSTS_TEMPLAT GENHOSTS_EXTRA_ARGS += kdevops_playbooks_dir_full_path='$(KDEVOPS_PLAYBOOKS_DIR_FULL_PATH)' GENHOSTS_EXTRA_ARGS += kdevops_genhosts_templates_dir='$(KDEVOPS_HOSTS_TEMPLATE_DIR)' -GENHOSTS_EXTRA_ARGS += kdevops_hosts_prefix='$(CONFIG_KDEVOPS_HOSTS_PREFIX)' GENHOSTS_EXTRA_ARGS += kdevops_python_interpreter='$(CONFIG_KDEVOPS_PYTHON_INTERPRETER)' GENHOSTS_EXTRA_ARGS += kdevops_python_old_interpreter='$(CONFIG_KDEVOPS_PYTHON_OLD_INTERPRETER)' ifeq (y,$(CONFIG_KDEVOPS_BASELINE_AND_DEV)) diff --git a/scripts/ssh.Makefile b/scripts/ssh.Makefile index 6265752d77d5..3ee9437b1b4c 100644 --- a/scripts/ssh.Makefile +++ b/scripts/ssh.Makefile @@ -11,9 +11,6 @@ SSH_CONFIG_FILE:=$(subst ",,$(CONFIG_KDEVOPS_SSH_CONFIG)) ANSIBLE_EXTRA_ARGS += sshconfig=$(CONFIG_KDEVOPS_SSH_CONFIG) endif -KDEVOPS_HOSTS_PREFIX:=$(subst ",,$(CONFIG_KDEVOPS_HOSTS_PREFIX)) -ANSIBLE_EXTRA_ARGS += kdevops_host_prefix=$(KDEVOPS_HOSTS_PREFIX) - PHONY += remove-ssh-key remove-ssh-key: $(NQ) Removing key pair for $(KDEVOPS_SSH_PRIVKEY) -- 2.43.0