From bbbb2654661925436c95152186c4af92e0862ee7 Mon Sep 17 00:00:00 2001
From: Maxime Noel <maxime.noel@suse.com>
Date: Thu, 12 Sep 2024 14:46:34 +0200
Subject: [PATCH] Update names in BV NUE 43

---
 .../SUSEManager-4.3-build-validation-NUE.tf   | 224 +++++++++---------
 1 file changed, 112 insertions(+), 112 deletions(-)

diff --git a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-NUE.tf b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-NUE.tf
index cafdb2d03..b52291283 100644
--- a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-NUE.tf
+++ b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-NUE.tf
@@ -167,7 +167,7 @@ module "server" {
   source             = "./modules/server"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "srv"
+  name               = "server"
   provider_settings = {
     mac                = "aa:b2:92:42:00:a1"
     memory             = 40960
@@ -207,7 +207,7 @@ module "proxy" {
   source             = "./modules/proxy"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "pxy"
+  name               = "proxy"
   provider_settings = {
     mac                = "aa:b2:92:42:00:a2"
     memory             = 4096
@@ -232,14 +232,14 @@ module "sles12sp5_client" {
   source             = "./modules/client"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "cli-sles12sp5"
+  name               = "sles12sp5-client"
   image              = "sles12sp5o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:a9"
     memory             = 4096
   }
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_register           = false
   use_os_released_updates = false
@@ -250,14 +250,14 @@ module "sles15sp2_client" {
   source             = "./modules/client"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "cli-sles15sp2"
+  name               = "sles15sp2-client"
   image              = "sles15sp2o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:ac"
     memory             = 4096
   }
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_register           = false
   use_os_released_updates = false
@@ -268,14 +268,14 @@ module "sles15sp3_client" {
   source             = "./modules/client"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "cli-sles15sp3"
+  name               = "sles15sp3-client"
   image              = "sles15sp3o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:ad"
     memory             = 4096
   }
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_register           = false
   use_os_released_updates = false
@@ -286,14 +286,14 @@ module "sles15sp4_client" {
   source             = "./modules/client"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "cli-sles15sp4"
+  name               = "sles15sp4-client"
   image              = "sles15sp4o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:ae"
     memory             = 4096
   }
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_register           = false
   use_os_released_updates = false
@@ -304,14 +304,14 @@ module "sles15sp5_client" {
   source             = "./modules/client"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "cli-sles15sp5"
+  name               = "sles15sp5-client"
   image              = "sles15sp5o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:aa"
     memory             = 4096
   }
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_register           = false
   use_os_released_updates = false
@@ -322,14 +322,14 @@ module "sles15sp6_client" {
   source             = "./modules/client"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "cli-sles15sp6"
+  name               = "sles15sp6-client"
   image              = "sles15sp6o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:a8"
     memory             = 4096
   }
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_register           = false
   use_os_released_updates = false
@@ -340,14 +340,14 @@ module "centos7_client" {
   source             = "./modules/client"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "cli-centos7"
+  name               = "centos7-client"
   image              = "centos7o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:af"
     memory             = 4096
   }
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_register           = false
   use_os_released_updates = false
@@ -361,14 +361,14 @@ module "sles12sp5_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "min-sles12sp5"
+  name               = "sles12sp5-minion"
   image              = "sles12sp5o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:b1"
     memory             = 4096
   }
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -379,7 +379,7 @@ module "sles15sp2_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "min-sles15sp2"
+  name               = "sles15sp2-minion"
   image              = "sles15sp2o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:b4"
@@ -387,7 +387,7 @@ module "sles15sp2_minion" {
   }
 
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -398,7 +398,7 @@ module "sles15sp3_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "min-sles15sp3"
+  name               = "sles15sp3-minion"
   image              = "sles15sp3o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:b5"
@@ -406,7 +406,7 @@ module "sles15sp3_minion" {
   }
 
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -417,7 +417,7 @@ module "sles15sp4_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "min-sles15sp4"
+  name               = "sles15sp4-minion"
   image              = "sles15sp4o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:b6"
@@ -425,7 +425,7 @@ module "sles15sp4_minion" {
   }
 
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -436,7 +436,7 @@ module "sles15sp5_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "min-sles15sp5"
+  name               = "sles15sp5-minion"
   image              = "sles15sp5o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:b2"
@@ -444,7 +444,7 @@ module "sles15sp5_minion" {
   }
 
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -455,7 +455,7 @@ module "sles15sp6_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "min-sles15sp6"
+  name               = "sles15sp6-minion"
   image              = "sles15sp6o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:b0"
@@ -463,7 +463,7 @@ module "sles15sp6_minion" {
   }
 
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -474,14 +474,14 @@ module "alma8_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "min-alma8"
+  name               = "alma8-minion"
   image              = "almalinux8o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:b9"
     memory             = 4096
   }
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -495,14 +495,14 @@ module "alma9_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "min-alma9"
+  name               = "alma9-minion"
   image              = "almalinux9o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:c2"
     memory             = 4096
   }
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -516,14 +516,14 @@ module "centos7_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "min-centos7"
+  name               = "centos7-minion"
   image              = "centos7o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:b7"
     memory             = 4096
   }
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -538,14 +538,14 @@ module "liberty9_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "min-liberty9"
+  name               = "liberty9-minion"
   image              = "libertylinux9o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:c5"
     memory             = 4096
   }
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -559,14 +559,14 @@ module "oracle9_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "min-oracle9"
+  name               = "oracle9-minion"
   image              = "oraclelinux9o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:c3"
     memory             = 4096
   }
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -580,14 +580,14 @@ module "rocky8_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "min-rocky8"
+  name               = "rocky8-minion"
   image              = "rocky8o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:b8"
     memory             = 4096
   }
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -601,14 +601,14 @@ module "rocky9_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "min-rocky9"
+  name               = "rocky9-minion"
   image              = "rocky9o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:c1"
     memory             = 4096
   }
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -622,14 +622,14 @@ module "ubuntu2004_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "min-ubuntu2004"
+  name               = "ubuntu2004-minion"
   image              = "ubuntu2004o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:ba"
     memory             = 4096
   }
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -644,14 +644,14 @@ module "ubuntu2204_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "min-ubuntu2204"
+  name               = "ubuntu2204-minion"
   image              = "ubuntu2204o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:bb"
     memory             = 4096
   }
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -662,7 +662,7 @@ module "debian11_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "min-debian11"
+  name               = "debian11-minion"
   image              = "debian11o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:be"
@@ -670,7 +670,7 @@ module "debian11_minion" {
   }
 
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -681,7 +681,7 @@ module "debian12_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "min-debian12"
+  name               = "debian12-minion"
   image              = "debian12o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:bc"
@@ -689,7 +689,7 @@ module "debian12_minion" {
   }
 
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -706,17 +706,17 @@ module "opensuse154arm_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_arm.configuration
   product_version    = "4.3-released"
-  name               = "nue-min-opensuse154arm"
+  name               = "opensuse154arm-minion-nue"
   image              = "opensuse154armo"
   provider_settings = {
     mac                = "aa:b2:92:42:00:bf"
-    overwrite_fqdn     = "suma-bv-43-min-opensuse154arm.mgr.suse.de"
+    overwrite_fqdn     = "suma-bv-43-opensuse154arm-minion.mgr.suse.de"
     memory             = 2048
     vcpu               = 2
     xslt               = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt")
   }
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -730,17 +730,17 @@ module "opensuse155arm_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_arm.configuration
   product_version    = "4.3-released"
-  name               = "nue-min-opensuse155arm"
+  name               = "opensuse155arm-minion-nue"
   image              = "opensuse155armo"
   provider_settings = {
     mac                = "aa:b2:92:42:00:c0"
-    overwrite_fqdn     = "suma-bv-43-min-opensuse155arm.mgr.suse.de"
+    overwrite_fqdn     = "suma-bv-43-opensuse155arm-minion.mgr.suse.de"
     memory             = 2048
     vcpu               = 2
     xslt               = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt")
   }
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -754,17 +754,17 @@ module "opensuse156arm_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_arm.configuration
   product_version    = "4.3-released"
-  name               = "nue-min-opensuse156arm"
+  name               = "opensuse156arm-minion-nue"
   image              = "opensuse156armo"
   provider_settings = {
     mac                = "aa:b2:92:42:00:ce"
-    overwrite_fqdn     = "suma-bv-43-min-opensuse156arm.mgr.suse.de"
+    overwrite_fqdn     = "suma-bv-43-opensuse156arm-minion.mgr.suse.de"
     memory             = 2048
     vcpu               = 2
     xslt               = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt")
   }
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -776,7 +776,7 @@ module "sles15sp5s390_minion" {
   base_configuration = module.base_s390.configuration
   product_version    = "4.3-released"
 
-  name               = "min-sles15sp5s390"
+  name               = "sles15sp5s390-minion"
   image              = "s15s5-minimal-2part-xfs"
 
   provider_settings = {
@@ -795,7 +795,7 @@ module "sles15sp5s390_minion" {
 module "salt_migration_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
-  name               = "min-salt-migration"
+  name               = "salt-migration-minion"
   product_version    = "4.3-released"
   image              = "sles15sp5o"
   provider_settings  = {
@@ -804,7 +804,7 @@ module "salt_migration_minion" {
   }
 
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = true
   use_os_released_updates = false
@@ -816,7 +816,7 @@ module "slemicro51_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "min-slemicro51"
+  name               = "slemicro51-minion"
   image              = "slemicro51-ign"
   provider_settings = {
     mac                = "aa:b2:92:42:00:c6"
@@ -824,7 +824,7 @@ module "slemicro51_minion" {
   }
 
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -839,7 +839,7 @@ module "slemicro52_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "min-slemicro52"
+  name               = "slemicro52-minion"
   image              = "slemicro52-ign"
   provider_settings = {
     mac                = "aa:b2:92:42:00:c7"
@@ -847,7 +847,7 @@ module "slemicro52_minion" {
   }
 
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -862,7 +862,7 @@ module "slemicro53_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "min-slemicro53"
+  name               = "slemicro53-minion"
   image              = "slemicro53-ign"
   provider_settings = {
     mac                = "aa:b2:92:42:00:c8"
@@ -870,7 +870,7 @@ module "slemicro53_minion" {
   }
 
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -885,7 +885,7 @@ module "slemicro54_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "min-slemicro54"
+  name               = "slemicro54-minion"
   image              = "slemicro54-ign"
   provider_settings = {
     mac                = "aa:b2:92:42:00:c9"
@@ -893,7 +893,7 @@ module "slemicro54_minion" {
   }
 
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -908,7 +908,7 @@ module "slemicro55_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "min-slemicro55"
+  name               = "slemicro55-minion"
   image              = "slemicro55o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:ca"
@@ -916,7 +916,7 @@ module "slemicro55_minion" {
   }
 
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -931,7 +931,7 @@ module "slmicro60_minion" {
   source             = "./modules/minion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "min-slmicro60"
+  name               = "slmicro60-minion"
   image              = "slmicro60o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:cb"
@@ -939,7 +939,7 @@ module "slmicro60_minion" {
   }
 
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -951,7 +951,7 @@ module "sles12sp5_ssh_minion" {
   source             = "./modules/sshminion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "minssh-sles12sp5"
+  name               = "sles12sp5-sshminion"
   image              = "sles12sp5o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:d1"
@@ -967,7 +967,7 @@ module "sles15sp2_ssh_minion" {
   source             = "./modules/sshminion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "minssh-sles15sp2"
+  name               = "sles15sp2-sshminion"
   image              = "sles15sp2o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:d4"
@@ -981,7 +981,7 @@ module "sles15sp3_ssh_minion" {
   source             = "./modules/sshminion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "minssh-sles15sp3"
+  name               = "sles15sp3-sshminion"
   image              = "sles15sp3o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:d5"
@@ -995,7 +995,7 @@ module "sles15sp4_ssh_minion" {
   source             = "./modules/sshminion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "minssh-sles15sp4"
+  name               = "sles15sp4-sshminion"
   image              = "sles15sp4o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:d6"
@@ -1009,7 +1009,7 @@ module "sles15sp5_ssh_minion" {
   source             = "./modules/sshminion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "minssh-sles15sp5"
+  name               = "sles15sp5-sshminion"
   image              = "sles15sp5o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:d2"
@@ -1023,7 +1023,7 @@ module "sles15sp6_ssh_minion" {
   source             = "./modules/sshminion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "minssh-sles15sp6"
+  name               = "sles15sp6-sshminion"
   image              = "sles15sp6o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:d0"
@@ -1037,7 +1037,7 @@ module "alma8_ssh_minion" {
   source             = "./modules/sshminion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "minssh-alma8"
+  name               = "alma8-sshminion"
   image              = "almalinux8o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:d9"
@@ -1054,7 +1054,7 @@ module "alma9_ssh_minion" {
   source             = "./modules/sshminion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "minssh-alma9"
+  name               = "alma9-sshminion"
   image              = "almalinux9o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:e2"
@@ -1071,7 +1071,7 @@ module "centos7_ssh_minion" {
   source             = "./modules/sshminion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "minssh-centos7"
+  name               = "centos7-sshminion"
   image              = "centos7o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:d7"
@@ -1088,7 +1088,7 @@ module "liberty9_ssh_minion" {
   source             = "./modules/sshminion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "minssh-liberty9"
+  name               = "liberty9-sshminion"
   image              = "libertylinux9o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:e5"
@@ -1105,7 +1105,7 @@ module "oracle9_ssh_minion" {
   source             = "./modules/sshminion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "minssh-oracle9"
+  name               = "oracle9-sshminion"
   image              = "oraclelinux9o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:e3"
@@ -1122,7 +1122,7 @@ module "rocky8_ssh_minion" {
   source             = "./modules/sshminion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "minssh-rocky8"
+  name               = "rocky8-sshminion"
   image              = "rocky8o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:d8"
@@ -1139,7 +1139,7 @@ module "rocky9_ssh_minion" {
   source             = "./modules/sshminion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "minssh-rocky9"
+  name               = "rocky9-sshminion"
   image              = "rocky9o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:e1"
@@ -1156,7 +1156,7 @@ module "ubuntu2004_ssh_minion" {
   source             = "./modules/sshminion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "minssh-ubuntu2004"
+  name               = "ubuntu2004-sshminion"
   image              = "ubuntu2004o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:da"
@@ -1174,7 +1174,7 @@ module "ubuntu2204_ssh_minion" {
   source             = "./modules/sshminion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "minssh-ubuntu2204"
+  name               = "ubuntu2204-sshminion"
   image              = "ubuntu2204o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:db"
@@ -1188,7 +1188,7 @@ module "debian11_ssh_minion" {
   source             = "./modules/sshminion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "minssh-debian11"
+  name               = "debian11-sshminion"
   image              = "debian11o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:de"
@@ -1202,7 +1202,7 @@ module "debian12_ssh_minion" {
   source             = "./modules/sshminion"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "minssh-debian12"
+  name               = "debian12-sshminion"
   image              = "debian12o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:dc"
@@ -1222,11 +1222,11 @@ module "opensuse154arm_ssh_minion" {
   source             = "./modules/sshminion"
   base_configuration = module.base_arm.configuration
   product_version    = "4.3-released"
-  name               = "nue-minssh-opensuse154arm"
+  name               = "opensuse154arm-sshminion-nue"
   image              = "opensuse154armo"
   provider_settings = {
     mac                = "aa:b2:92:42:00:df"
-    overwrite_fqdn     = "suma-bv-43-minssh-opensuse154arm.mgr.suse.de"
+    overwrite_fqdn     = "suma-bv-43-opensuse154arm-sshminion.mgr.suse.de"
     memory             = 2048
     vcpu               = 2
     xslt               = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt")
@@ -1242,11 +1242,11 @@ module "opensuse155arm_ssh_minion" {
   source             = "./modules/sshminion"
   base_configuration = module.base_arm.configuration
   product_version    = "4.3-released"
-  name               = "nue-minssh-opensuse155arm"
+  name               = "opensuse155arm-sshminion-nue"
   image              = "opensuse155armo"
   provider_settings = {
     mac                = "aa:b2:92:42:00:e0"
-    overwrite_fqdn     = "suma-bv-43-minssh-opensuse155arm.mgr.suse.de"
+    overwrite_fqdn     = "suma-bv-43-opensuse155arm-sshminion.mgr.suse.de"
     memory             = 2048
     vcpu               = 2
     xslt               = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt")
@@ -1262,11 +1262,11 @@ module "opensuse156arm_ssh_minion" {
   source             = "./modules/sshminion"
   base_configuration = module.base_arm.configuration
   product_version    = "4.3-released"
-  name               = "nue-minssh-opensuse156arm"
+  name               = "opensuse156arm-sshminion-nue"
   image              = "opensuse156armo"
   provider_settings = {
     mac                = "aa:b2:92:42:00:ee"
-    overwrite_fqdn     = "suma-bv-43-minssh-opensuse156arm.mgr.suse.de"
+    overwrite_fqdn     = "suma-bv-43-opensuse156arm-sshminion.mgr.suse.de"
     memory             = 2048
     vcpu               = 2
     xslt               = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt")
@@ -1280,7 +1280,7 @@ module "sles15sp5s390_ssh_minion" {
   base_configuration = module.base_s390.configuration
   product_version    = "4.3-released"
 
-  name               = "minssh-sles15sp5s390"
+  name               = "sles15sp5s390-sshminion"
   image              = "s15s5-minimal-2part-xfs"
 
   provider_settings = {
@@ -1299,7 +1299,7 @@ module "sles15sp5s390_ssh_minion" {
 //   source             = "./modules/sshminion"
 //   base_configuration = module.base_core.configuration
 //   product_version    = "4.3-released"
-//   name               = "minssh-slemicro51"
+//   name               = "slemicro51-sshminion"
 //   image              = "slemicro51-ign"
 //   provider_settings = {
 //     mac                = "aa:b2:92:42:00:e6"
@@ -1314,7 +1314,7 @@ module "sles15sp5s390_ssh_minion" {
 //   source             = "./modules/sshminion"
 //   base_configuration = module.base_core.configuration
 //   product_version    = "4.3-released"
-//   name               = "minssh-slemicro52"
+//   name               = "slemicro52-sshminion"
 //   image              = "slemicro52-ign"
 //   provider_settings = {
 //     mac                = "aa:b2:92:42:00:e7"
@@ -1329,7 +1329,7 @@ module "sles15sp5s390_ssh_minion" {
 //   source             = "./modules/sshminion"
 //   base_configuration = module.base_core.configuration
 //   product_version    = "4.3-released"
-//   name               = "minssh-slemicro53"
+//   name               = "slemicro53-sshminion"
 //   image              = "slemicro53-ign"
 //   provider_settings = {
 //     mac                = "aa:b2:92:42:00:e8"
@@ -1344,7 +1344,7 @@ module "sles15sp5s390_ssh_minion" {
 //   source             = "./modules/sshminion"
 //   base_configuration = module.base_core.configuration
 //   product_version    = "4.3-released"
-//   name               = "minssh-slemicro54"
+//   name               = "slemicro54-sshminion"
 //   image              = "slemicro54-ign"
 //   provider_settings = {
 //     mac                = "aa:b2:92:42:00:e9"
@@ -1359,7 +1359,7 @@ module "sles15sp5s390_ssh_minion" {
 //   source             = "./modules/sshminion"
 //   base_configuration = module.base_core.configuration
 //   product_version    = "4.3-released"
-//   name               = "minssh-slemicro55"
+//   name               = "slemicro55-sshminion"
 //   image              = "slemicro55o"
 //   provider_settings = {
 //     mac                = "aa:b2:92:42:00:ea"
@@ -1374,7 +1374,7 @@ module "sles15sp5s390_ssh_minion" {
 //   source             = "./modules/sshminion"
 //   base_configuration = module.base_core.configuration
 //   product_version    = "4.3-released"
-//   name               = "minssh-slmicro60"
+//   name               = "slmicro60-sshminion"
 //   image              = "slmicro60o"
 //   provider_settings = {
 //     mac                = "aa:b2:92:42:00:eb"
@@ -1388,7 +1388,7 @@ module "sles12sp5_buildhost" {
   source             = "./modules/build_host"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "build-sles12sp5"
+  name               = "sles12sp5-build"
   image              = "sles12sp5o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:a4"
@@ -1396,7 +1396,7 @@ module "sles12sp5_buildhost" {
     vcpu               = 2
   }
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -1406,7 +1406,7 @@ module "sles12sp5_buildhost" {
 module "sles12sp5_terminal" {
   source             = "./modules/pxe_boot"
   base_configuration = module.base_core.configuration
-  name               = "terminal-sles12sp5"
+  name               = "sles12sp5-terminional"
   image              = "sles12sp5o"
   provider_settings = {
     memory             = 2048
@@ -1422,7 +1422,7 @@ module "sles15sp4_buildhost" {
   source             = "./modules/build_host"
   base_configuration = module.base_core.configuration
   product_version    = "4.3-released"
-  name               = "build-sles15sp4"
+  name               = "sles15sp4-build"
   image              = "sles15sp4o"
   provider_settings = {
     mac                = "aa:b2:92:42:00:a5"
@@ -1430,7 +1430,7 @@ module "sles15sp4_buildhost" {
     vcpu               = 2
   }
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -1440,7 +1440,7 @@ module "sles15sp4_buildhost" {
 module "sles15sp4_terminal" {
   source             = "./modules/pxe_boot"
   base_configuration = module.base_core.configuration
-  name               = "terminal-sles15sp4"
+  name               = "sles15sp4-terminional"
   image              = "sles15sp4o"
   provider_settings = {
     memory             = 2048
@@ -1464,7 +1464,7 @@ module "monitoring_server" {
   }
 
   server_configuration = {
-    hostname = "suma-bv-43-pxy.mgr.suse.de"
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -1474,7 +1474,7 @@ module "monitoring_server" {
 module "controller" {
   source             = "./modules/controller"
   base_configuration = module.base_core.configuration
-  name               = "ctl"
+  name               = "controller"
   provider_settings = {
     mac                = "aa:b2:92:42:00:a0"
     memory             = 16384