[PATCH 3/5] scripts/ssh.Makefile: remove Makefile appending of KDEVOPS_HOSTS_PREFIX

[Luis Chamberlain <mcgrof@kernel.org>]

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 <mcgrof@kernel.org>
---
 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