From 2d4e422280d6e4d04b918b363e64e08b7bcd143b Mon Sep 17 00:00:00 2001 From: Maxime Noel Date: Wed, 25 Sep 2024 09:24:25 +1200 Subject: [PATCH 1/3] Update uyuni PRV and NUE and 5.0 PRV --- .../SUSEManager-5.0-build-validation-PRV.tf | 188 +++++++++--------- .../Uyuni-Master-build-validation-NUE.tf | 180 ++++++++--------- .../Uyuni-Master-build-validation-PRV.tf | 180 ++++++++--------- 3 files changed, 274 insertions(+), 274 deletions(-) diff --git a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf index b545b27fa..f9cf72a9a 100644 --- a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf +++ b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf @@ -313,7 +313,7 @@ module "server_containerized" { source = "./modules/server_containerized" base_configuration = module.base_core.configuration product_version = "5.0-released" - name = "srv" + name = "server" image = "slemicro55o" provider_settings = { mac = "aa:b2:92:05:00:01" @@ -353,7 +353,7 @@ module "proxy_containerized" { source = "./modules/proxy_containerized" base_configuration = module.base_retail.configuration product_version = "5.0-released" - name = "pxy" + name = "proxy" provider_settings = { mac = "aa:b2:92:05:00:02" memory = 4096 @@ -376,14 +376,14 @@ module "sles12sp5_minion" { source = "./modules/minion" base_configuration = module.base_old_sle.configuration product_version = "head" - name = "min-sles12sp5" + name = "sles12sp5-minion" image = "sles12sp5o" provider_settings = { mac = "aa:b2:92:05:00:11" memory = 4096 } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -400,7 +400,7 @@ module "sles15sp2_minion" { source = "./modules/minion" base_configuration = module.base_new_sle.configuration product_version = "5.0-released" - name = "min-sles15sp2" + name = "sles15sp2-minion" image = "sles15sp2o" provider_settings = { mac = "aa:b2:92:05:00:14" @@ -408,7 +408,7 @@ module "sles15sp2_minion" { } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -425,7 +425,7 @@ module "sles15sp3_minion" { source = "./modules/minion" base_configuration = module.base_new_sle.configuration product_version = "5.0-released" - name = "min-sles15sp3" + name = "sles15sp3-minion" image = "sles15sp3o" provider_settings = { mac = "aa:b2:92:05:00:15" @@ -433,7 +433,7 @@ module "sles15sp3_minion" { } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -450,7 +450,7 @@ module "sles15sp4_minion" { source = "./modules/minion" base_configuration = module.base_new_sle.configuration product_version = "5.0-released" - name = "min-sles15sp4" + name = "sles15sp4-minion" image = "sles15sp4o" provider_settings = { mac = "aa:b2:92:05:00:16" @@ -458,7 +458,7 @@ module "sles15sp4_minion" { } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -475,7 +475,7 @@ module "sles15sp5_minion" { source = "./modules/minion" base_configuration = module.base_new_sle.configuration product_version = "5.0-released" - name = "min-sles15sp5" + name = "sles15sp5-minion" image = "sles15sp5o" provider_settings = { mac = "aa:b2:92:05:00:12" @@ -483,7 +483,7 @@ module "sles15sp5_minion" { } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -500,7 +500,7 @@ module "sles15sp6_minion" { source = "./modules/minion" base_configuration = module.base_new_sle.configuration product_version = "5.0-released" - name = "min-sles15sp6" + name = "sles15sp6-minion" image = "sles15sp6o" provider_settings = { mac = "aa:b2:92:05:00:10" @@ -508,7 +508,7 @@ module "sles15sp6_minion" { } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -525,14 +525,14 @@ module "alma8_minion" { source = "./modules/minion" base_configuration = module.base_res.configuration product_version = "5.0-released" - name = "min-alma8" + name = "alma8-minion" image = "almalinux8o" provider_settings = { mac = "aa:b2:92:05:00:19" memory = 4096 } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -549,14 +549,14 @@ module "alma9_minion" { source = "./modules/minion" base_configuration = module.base_res.configuration product_version = "5.0-released" - name = "min-alma9" + name = "alma9-minion" image = "almalinux9o" provider_settings = { mac = "aa:b2:92:05:00:22" memory = 4096 } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -573,14 +573,14 @@ module "centos7_minion" { source = "./modules/minion" base_configuration = module.base_res.configuration product_version = "5.0-released" - name = "min-centos7" + name = "centos7-minion" image = "centos7o" provider_settings = { mac = "aa:b2:92:05:00:17" memory = 4096 } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -597,14 +597,14 @@ module "liberty9_minion" { source = "./modules/minion" base_configuration = module.base_res.configuration product_version = "5.0-released" - name = "min-liberty9" + name = "liberty9-minion" image = "libertylinux9o" provider_settings = { mac = "aa:b2:92:05:00:25" memory = 4096 } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -621,14 +621,14 @@ module "oracle9_minion" { source = "./modules/minion" base_configuration = module.base_res.configuration product_version = "5.0-released" - name = "min-oracle9" + name = "oracle9-minion" image = "oraclelinux9o" provider_settings = { mac = "aa:b2:92:05:00:23" memory = 4096 } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -645,14 +645,14 @@ module "rocky8_minion" { source = "./modules/minion" base_configuration = module.base_res.configuration product_version = "5.0-released" - name = "min-rocky8" + name = "rocky8-minion" image = "rocky8o" provider_settings = { mac = "aa:b2:92:05:00:18" memory = 4096 } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -669,14 +669,14 @@ module "rocky9_minion" { source = "./modules/minion" base_configuration = module.base_res.configuration product_version = "5.0-released" - name = "min-rocky9" + name = "rocky9-minion" image = "rocky9o" provider_settings = { mac = "aa:b2:92:05:00:21" memory = 4096 } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -693,14 +693,14 @@ module "ubuntu2004_minion" { source = "./modules/minion" base_configuration = module.base_debian.configuration product_version = "5.0-released" - name = "min-ubuntu2004" + name = "ubuntu2004-minion" image = "ubuntu2004o" provider_settings = { mac = "aa:b2:92:05:00:1a" memory = 4096 } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -718,14 +718,14 @@ module "ubuntu2204_minion" { source = "./modules/minion" base_configuration = module.base_debian.configuration product_version = "5.0-released" - name = "min-ubuntu2204" + name = "ubuntu2204-minion" image = "ubuntu2204o" provider_settings = { mac = "aa:b2:92:05:00:1b" memory = 4096 } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -742,7 +742,7 @@ module "debian11_minion" { source = "./modules/minion" base_configuration = module.base_debian.configuration product_version = "5.0-released" - name = "min-debian11" + name = "debian11-minion" image = "debian11o" provider_settings = { mac = "aa:b2:92:05:00:1e" @@ -750,7 +750,7 @@ module "debian11_minion" { } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -767,7 +767,7 @@ module "debian12_minion" { source = "./modules/minion" base_configuration = module.base_debian.configuration product_version = "5.0-released" - name = "min-debian12" + name = "debian12-minion" image = "debian12o" provider_settings = { mac = "aa:b2:92:05:00:1c" @@ -775,7 +775,7 @@ module "debian12_minion" { } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -792,17 +792,17 @@ module "opensuse155arm_minion" { source = "./modules/minion" base_configuration = module.base_arm.configuration product_version = "5.0-released" - name = "prv-min-opensuse155arm" + name = "opensuse155arm-minion-prv" image = "opensuse155armo" provider_settings = { mac = "aa:b2:92:42:00:08" - overwrite_fqdn = "suma-bv-50-min-opensuse155arm.mgr.prv.suse.net" + overwrite_fqdn = "suma-bv-50-opensuse155arm-minion.mgr.prv.suse.net" memory = 2048 vcpu = 2 xslt = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt") } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -819,17 +819,17 @@ module "opensuse156arm_minion" { source = "./modules/minion" base_configuration = module.base_arm.configuration product_version = "5.0-released" - name = "prv-min-opensuse156arm" + name = "opensuse156arm-minion-prv" image = "opensuse156armo" provider_settings = { mac = "aa:b2:92:42:00:0a" - overwrite_fqdn = "suma-bv-50-min-opensuse156arm.mgr.prv.suse.net" + overwrite_fqdn = "suma-bv-50-opensuse156arm-minion.mgr.prv.suse.net" memory = 2048 vcpu = 2 xslt = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt") } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -844,7 +844,7 @@ module "sles15sp5s390_minion" { base_configuration = module.base_s390.configuration product_version = "5.0-released" - name = "min-sles15sp5s390" + name = "sles15sp5s390-minion" image = "s15s5-minimal-2part-xfs" provider_settings = { @@ -866,7 +866,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 = "5.0-released" image = "sles15sp5o" provider_settings = { @@ -875,7 +875,7 @@ module "salt_migration_minion" { } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = true use_os_released_updates = false @@ -890,7 +890,7 @@ module "slemicro51_minion" { source = "./modules/minion" base_configuration = module.base_new_sle.configuration product_version = "5.0-released" - name = "min-slemicro51" + name = "slemicro51-minion" image = "slemicro51-ign" provider_settings = { mac = "aa:b2:92:05:00:26" @@ -898,7 +898,7 @@ module "slemicro51_minion" { } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -916,7 +916,7 @@ module "slemicro52_minion" { source = "./modules/minion" base_configuration = module.base_new_sle.configuration product_version = "5.0-released" - name = "min-slemicro52" + name = "slemicro52-minion" image = "slemicro52-ign" provider_settings = { mac = "aa:b2:92:05:00:27" @@ -924,7 +924,7 @@ module "slemicro52_minion" { } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -942,7 +942,7 @@ module "slemicro53_minion" { source = "./modules/minion" base_configuration = module.base_new_sle.configuration product_version = "5.0-released" - name = "min-slemicro53" + name = "slemicro53-minion" image = "slemicro53-ign" provider_settings = { mac = "aa:b2:92:05:00:28" @@ -950,7 +950,7 @@ module "slemicro53_minion" { } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -968,7 +968,7 @@ module "slemicro54_minion" { source = "./modules/minion" base_configuration = module.base_new_sle.configuration product_version = "5.0-released" - name = "min-slemicro54" + name = "slemicro54-minion" image = "slemicro54-ign" provider_settings = { mac = "aa:b2:92:05:00:29" @@ -976,7 +976,7 @@ module "slemicro54_minion" { } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -994,7 +994,7 @@ module "slemicro55_minion" { source = "./modules/minion" base_configuration = module.base_new_sle.configuration product_version = "5.0-released" - name = "min-slemicro55" + name = "slemicro55-minion" image = "slemicro55o" provider_settings = { mac = "aa:b2:92:05:00:2a" @@ -1002,7 +1002,7 @@ module "slemicro55_minion" { } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -1020,7 +1020,7 @@ module "slmicro60_minion" { source = "./modules/minion" base_configuration = module.base_new_sle.configuration product_version = "5.0-released" - name = "min-slmicro60" + name = "slmicro60-minion" image = "slmicro60o" provider_settings = { mac = "aa:b2:92:05:00:2b" @@ -1028,7 +1028,7 @@ module "slmicro60_minion" { } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -1047,7 +1047,7 @@ module "sles12sp5_sshminion" { source = "./modules/sshminion" base_configuration = module.base_old_sle.configuration product_version = "5.0-released" - name = "minssh-sles12sp5" + name = "sles12sp5-sshminion" image = "sles12sp5o" provider_settings = { mac = "aa:b2:92:05:00:31" @@ -1069,7 +1069,7 @@ module "sles15sp2_sshminion" { source = "./modules/sshminion" base_configuration = module.base_new_sle.configuration product_version = "5.0-released" - name = "minssh-sles15sp2" + name = "sles15sp2-sshminion" image = "sles15sp2o" provider_settings = { mac = "aa:b2:92:05:00:34" @@ -1089,7 +1089,7 @@ module "sles15sp3_sshminion" { source = "./modules/sshminion" base_configuration = module.base_new_sle.configuration product_version = "5.0-released" - name = "minssh-sles15sp3" + name = "sles15sp3-sshminion" image = "sles15sp3o" provider_settings = { mac = "aa:b2:92:05:00:35" @@ -1109,7 +1109,7 @@ module "sles15sp4_sshminion" { source = "./modules/sshminion" base_configuration = module.base_new_sle.configuration product_version = "5.0-released" - name = "minssh-sles15sp4" + name = "sles15sp4-sshminion" image = "sles15sp4o" provider_settings = { mac = "aa:b2:92:05:00:36" @@ -1129,7 +1129,7 @@ module "sles15sp5_sshminion" { source = "./modules/sshminion" base_configuration = module.base_new_sle.configuration product_version = "5.0-released" - name = "minssh-sles15sp5" + name = "sles15sp5-sshminion" image = "sles15sp5o" provider_settings = { mac = "aa:b2:92:05:00:32" @@ -1149,7 +1149,7 @@ module "sles15sp6_sshminion" { source = "./modules/sshminion" base_configuration = module.base_new_sle.configuration product_version = "5.0-released" - name = "minssh-sles15sp6" + name = "sles15sp6-sshminion" image = "sles15sp6o" provider_settings = { mac = "aa:b2:92:05:00:30" @@ -1169,7 +1169,7 @@ module "alma8_sshminion" { source = "./modules/sshminion" base_configuration = module.base_res.configuration product_version = "5.0-released" - name = "minssh-alma8" + name = "alma8-sshminion" image = "almalinux8o" provider_settings = { mac = "aa:b2:92:05:00:39" @@ -1189,7 +1189,7 @@ module "alma9_sshminion" { source = "./modules/sshminion" base_configuration = module.base_res.configuration product_version = "5.0-released" - name = "minssh-alma9" + name = "alma9-sshminion" image = "almalinux9o" provider_settings = { mac = "aa:b2:92:05:00:42" @@ -1209,7 +1209,7 @@ module "centos7_sshminion" { source = "./modules/sshminion" base_configuration = module.base_res.configuration product_version = "5.0-released" - name = "minssh-centos7" + name = "centos7-sshminion" image = "centos7o" provider_settings = { mac = "aa:b2:92:05:00:37" @@ -1229,7 +1229,7 @@ module "liberty9_sshminion" { source = "./modules/sshminion" base_configuration = module.base_res.configuration product_version = "5.0-released" - name = "minssh-liberty9" + name = "liberty9-sshminion" image = "libertylinux9o" provider_settings = { mac = "aa:b2:92:05:00:45" @@ -1249,7 +1249,7 @@ module "oracle9_sshminion" { source = "./modules/sshminion" base_configuration = module.base_res.configuration product_version = "5.0-released" - name = "minssh-oracle9" + name = "oracle9-sshminion" image = "oraclelinux9o" provider_settings = { mac = "aa:b2:92:05:00:43" @@ -1269,7 +1269,7 @@ module "rocky8_sshminion" { source = "./modules/sshminion" base_configuration = module.base_res.configuration product_version = "5.0-released" - name = "minssh-rocky8" + name = "rocky8-sshminion" image = "rocky8o" provider_settings = { mac = "aa:b2:92:05:00:38" @@ -1289,7 +1289,7 @@ module "rocky9_sshminion" { source = "./modules/sshminion" base_configuration = module.base_res.configuration product_version = "5.0-released" - name = "minssh-rocky9" + name = "rocky9-sshminion" image = "rocky9o" provider_settings = { mac = "aa:b2:92:05:00:41" @@ -1309,7 +1309,7 @@ module "ubuntu2004_sshminion" { source = "./modules/sshminion" base_configuration = module.base_debian.configuration product_version = "5.0-released" - name = "minssh-ubuntu2004" + name = "ubuntu2004-sshminion" image = "ubuntu2004o" provider_settings = { mac = "aa:b2:92:05:00:3a" @@ -1330,7 +1330,7 @@ module "ubuntu2204_sshminion" { source = "./modules/sshminion" base_configuration = module.base_debian.configuration product_version = "5.0-released" - name = "minssh-ubuntu2204" + name = "ubuntu2204-sshminion" image = "ubuntu2204o" provider_settings = { mac = "aa:b2:92:05:00:3b" @@ -1350,7 +1350,7 @@ module "debian11_sshminion" { source = "./modules/sshminion" base_configuration = module.base_debian.configuration product_version = "5.0-released" - name = "minssh-debian11" + name = "debian11-sshminion" image = "debian11o" provider_settings = { mac = "aa:b2:92:05:00:3e" @@ -1370,7 +1370,7 @@ module "debian12_sshminion" { source = "./modules/sshminion" base_configuration = module.base_debian.configuration product_version = "5.0-released" - name = "minssh-debian12" + name = "debian12-sshminion" image = "debian12o" provider_settings = { mac = "aa:b2:92:05:00:3c" @@ -1390,11 +1390,11 @@ module "opensuse155arm_sshminion" { source = "./modules/sshminion" base_configuration = module.base_arm.configuration product_version = "5.0-released" - name = "prv-minssh-opensuse155arm" + name = "opensuse155arm-sshminion-prv" image = "opensuse155armo" provider_settings = { mac = "aa:b2:92:42:00:09" - overwrite_fqdn = "suma-bv-50-minssh-opensuse155arm.mgr.prv.suse.net" + overwrite_fqdn = "suma-bv-50-opensuse155arm-sshminion.mgr.prv.suse.net" memory = 2048 vcpu = 2 xslt = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt") @@ -1413,11 +1413,11 @@ module "opensuse156arm_sshminion" { source = "./modules/sshminion" base_configuration = module.base_arm.configuration product_version = "5.0-released" - name = "prv-minssh-opensuse156arm" + name = "opensuse156arm-sshminion-prv" image = "opensuse156armo" provider_settings = { mac = "aa:b2:92:42:00:0b" - overwrite_fqdn = "suma-bv-50-minssh-opensuse156arm.mgr.prv.suse.net" + overwrite_fqdn = "suma-bv-50-opensuse156arm-sshminion.mgr.prv.suse.net" memory = 2048 vcpu = 2 xslt = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt") @@ -1434,7 +1434,7 @@ module "sles15sp5s390_sshminion" { base_configuration = module.base_s390.configuration product_version = "5.0-released" - name = "minssh-sles15sp5s390" + name = "sles15sp5s390-sshminion" image = "s15s5-minimal-2part-xfs" provider_settings = { @@ -1459,7 +1459,7 @@ module "sles15sp5s390_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_new_sle.configuration // product_version = "5.0-released" -// name = "minssh-slemicro51" +// name = "slemicro51-sshminion" // image = "slemicro51-ign" // provider_settings = { // mac = "aa:b2:92:05:00:46" @@ -1480,7 +1480,7 @@ module "sles15sp5s390_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_new_sle.configuration // product_version = "5.0-released" -// name = "minssh-slemicro52" +// name = "slemicro52-sshminion" // image = "slemicro52-ign" // provider_settings = { // mac = "aa:b2:92:05:00:47" @@ -1501,7 +1501,7 @@ module "sles15sp5s390_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_new_sle.configuration // product_version = "5.0-released" -// name = "minssh-slemicro53" +// name = "slemicro53-sshminion" // image = "slemicro53-ign" // provider_settings = { // mac = "aa:b2:92:05:00:48" @@ -1522,7 +1522,7 @@ module "sles15sp5s390_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_new_sle.configuration // product_version = "5.0-released" -// name = "minssh-slemicro54" +// name = "slemicro54-sshminion" // image = "slemicro54-ign" // provider_settings = { // mac = "aa:b2:92:05:00:49" @@ -1543,7 +1543,7 @@ module "sles15sp5s390_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_new_sle.configuration // product_version = "5.0-released" -// name = "minssh-slemicro55" +// name = "slemicro55-sshminion" // image = "slemicro55o" // provider_settings = { // mac = "aa:b2:92:05:00:4a" @@ -1564,7 +1564,7 @@ module "sles15sp5s390_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_new_sle.configuration // product_version = "5.0-released" -// name = "minssh-slmicro60" +// name = "slmicro60-sshminion" // image = "slmicro60o" // provider_settings = { // mac = "aa:b2:92:05:00:4b" @@ -1584,7 +1584,7 @@ module "sles12sp5_buildhost" { source = "./modules/build_host" base_configuration = module.base_retail.configuration product_version = "5.0-released" - name = "build-sles12sp5" + name = "sles12sp5-build" image = "sles12sp5o" provider_settings = { mac = "aa:b2:92:05:00:04" @@ -1592,7 +1592,7 @@ module "sles12sp5_buildhost" { vcpu = 2 } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -1608,7 +1608,7 @@ module "sles12sp5_terminal" { } source = "./modules/pxe_boot" base_configuration = module.base_retail.configuration - name = "terminal-sles12sp5" + name = "sles12sp5-terminional" image = "sles12sp5o" provider_settings = { memory = 2048 @@ -1627,7 +1627,7 @@ module "sles15sp4_buildhost" { source = "./modules/build_host" base_configuration = module.base_retail.configuration product_version = "5.0-released" - name = "build-sles15sp4" + name = "sles15sp4-build" image = "sles15sp4o" provider_settings = { mac = "aa:b2:92:05:00:05" @@ -1635,7 +1635,7 @@ module "sles15sp4_buildhost" { vcpu = 2 } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -1651,7 +1651,7 @@ module "sles15sp4_terminal" { } source = "./modules/pxe_boot" base_configuration = module.base_retail.configuration - name = "terminal-sles15sp4" + name = "sles15sp4-terminional" image = "sles15sp4o" provider_settings = { memory = 2048 @@ -1666,7 +1666,7 @@ module "sles15sp4_terminal" { module "dhcp_dns" { source = "./modules/dhcp_dns" base_configuration = module.base_retail.configuration - name = "dhcp-dns" + name = "dns-dhcp" image = "opensuse155o" private_hosts = [ module.proxy_containerized.configuration, @@ -1695,7 +1695,7 @@ module "monitoring_server" { } server_configuration = { - hostname = "suma-bv-50-pxy.mgr.prv.suse.net" + hostname = "suma-bv-50-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -1708,7 +1708,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:05:00:00" memory = 16384 diff --git a/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf b/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf index 3c4c5d368..fa1060ae8 100644 --- a/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf +++ b/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf @@ -167,7 +167,7 @@ module "server_containerized" { source = "./modules/server_containerized" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "srv" + name = "server" image = "leapmicro55o" provider_settings = { mac = "aa:b2:93:02:01:a1" @@ -210,7 +210,7 @@ module "proxy_containerized" { source = "./modules/proxy_containerized" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "pxy" + name = "proxy" provider_settings = { mac = "aa:b2:93:02:01:a2" memory = 4096 @@ -234,14 +234,14 @@ module "sles12sp5_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "min-sles12sp5" + name = "sles12sp5-minion" image = "sles12sp5o" provider_settings = { mac = "aa:b2:93:02:01:b1" memory = 4096 } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -252,7 +252,7 @@ module "sles15sp2_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "min-sles15sp2" + name = "sles15sp2-minion" image = "sles15sp2o" provider_settings = { mac = "aa:b2:93:02:01:b4" @@ -260,7 +260,7 @@ module "sles15sp2_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -271,7 +271,7 @@ module "sles15sp3_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "min-sles15sp3" + name = "sles15sp3-minion" image = "sles15sp3o" provider_settings = { mac = "aa:b2:93:02:01:b5" @@ -279,7 +279,7 @@ module "sles15sp3_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -290,7 +290,7 @@ module "sles15sp4_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "min-sles15sp4" + name = "sles15sp4-minion" image = "sles15sp4o" provider_settings = { mac = "aa:b2:93:02:01:b6" @@ -298,7 +298,7 @@ module "sles15sp4_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -309,7 +309,7 @@ module "sles15sp5_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "min-sles15sp5" + name = "sles15sp5-minion" image = "sles15sp5o" provider_settings = { mac = "aa:b2:93:02:01:b2" @@ -317,7 +317,7 @@ module "sles15sp5_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -328,7 +328,7 @@ module "sles15sp6_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "min-sles15sp6" + name = "sles15sp6-minion" image = "sles15sp6o" provider_settings = { mac = "aa:b2:93:02:01:b0" @@ -336,7 +336,7 @@ module "sles15sp6_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -347,14 +347,14 @@ module "alma8_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "min-alma8" + name = "alma8-minion" image = "almalinux8o" provider_settings = { mac = "aa:b2:93:02:01:b9" memory = 4096 } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -368,14 +368,14 @@ module "alma9_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "min-alma9" + name = "alma9-minion" image = "almalinux9o" provider_settings = { mac = "aa:b2:93:02:01:c2" memory = 4096 } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -389,14 +389,14 @@ module "centos7_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "min-centos7" + name = "centos7-minion" image = "centos7o" provider_settings = { mac = "aa:b2:93:02:01:b7" memory = 4096 } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -410,14 +410,14 @@ module "oracle9_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "min-oracle9" + name = "oracle9-minion" image = "oraclelinux9o" provider_settings = { mac = "aa:b2:93:02:01:c3" memory = 4096 } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -431,7 +431,7 @@ module "rocky8_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "min-rocky8" + name = "rocky8-minion" image = "rocky8o" provider_settings = { mac = "aa:b2:93:02:01:b8" @@ -439,7 +439,7 @@ module "rocky8_minion" { memory = 4096 } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -453,14 +453,14 @@ module "rocky9_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "min-rocky9" + name = "rocky9-minion" image = "rocky9o" provider_settings = { mac = "aa:b2:93:02:01:c1" memory = 4096 } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -474,14 +474,14 @@ module "ubuntu2004_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "min-ubuntu2004" + name = "ubuntu2004-minion" image = "ubuntu2004o" provider_settings = { mac = "aa:b2:93:02:01:ba" memory = 4096 } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -496,14 +496,14 @@ module "ubuntu2204_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "min-ubuntu2204" + name = "ubuntu2204-minion" image = "ubuntu2204o" provider_settings = { mac = "aa:b2:93:02:01:bb" memory = 4096 } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -514,7 +514,7 @@ module "debian11_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "min-debian11" + name = "debian11-minion" image = "debian11o" provider_settings = { mac = "aa:b2:93:02:01:be" @@ -522,7 +522,7 @@ module "debian11_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -533,7 +533,7 @@ module "debian12_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "min-debian12" + name = "debian12-minion" image = "debian12o" provider_settings = { mac = "aa:b2:93:02:01:bc" @@ -541,7 +541,7 @@ module "debian12_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -558,17 +558,17 @@ module "opensuse155arm_minion" { source = "./modules/minion" base_configuration = module.base_arm.configuration product_version = "uyuni-master" - name = "nue-min-opensuse155arm" + name = "opensuse155arm-minion-nue" image = "opensuse155armo" provider_settings = { mac = "aa:b2:93:02:01:c0" - overwrite_fqdn = "uyuni-bv-master-min-opensuse155arm.mgr.suse.de" + overwrite_fqdn = "uyuni-bv-master-opensuse155arm-minion.mgr.suse.de" memory = 2048 vcpu = 2 xslt = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt") } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -582,17 +582,17 @@ module "opensuse156arm_minion" { source = "./modules/minion" base_configuration = module.base_arm.configuration product_version = "uyuni-master" - name = "nue-min-opensuse156arm" + name = "opensuse156arm-minion-nue" image = "opensuse156armo" provider_settings = { mac = "aa:b2:93:02:01:ce" - overwrite_fqdn = "uyuni-bv-master-min-opensuse156arm.mgr.suse.de" + overwrite_fqdn = "uyuni-bv-master-opensuse156arm-minion.mgr.suse.de" memory = 2048 vcpu = 2 xslt = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt") } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -604,7 +604,7 @@ module "sles15sp5s390_minion" { base_configuration = module.base_s390.configuration product_version = "uyuni-master" - name = "min-sles15sp5s390" + name = "sles15sp5s390-minion" image = "s15s5-minimal-2part-xfs" provider_settings = { @@ -621,7 +621,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 = "uyuni-master" image = "sles15sp5o" provider_settings = { @@ -630,7 +630,7 @@ module "salt_migration_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = true use_os_released_updates = false @@ -642,7 +642,7 @@ module "slemicro51_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "min-slemicro51" + name = "slemicro51-minion" image = "slemicro51-ign" provider_settings = { mac = "aa:b2:93:02:01:c6" @@ -650,7 +650,7 @@ module "slemicro51_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -664,7 +664,7 @@ module "slemicro52_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "min-slemicro52" + name = "slemicro52-minion" image = "slemicro52-ign" provider_settings = { mac = "aa:b2:93:02:01:c7" @@ -672,7 +672,7 @@ module "slemicro52_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -686,7 +686,7 @@ module "slemicro53_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "min-slemicro53" + name = "slemicro53-minion" image = "slemicro53-ign" provider_settings = { mac = "aa:b2:93:02:01:c8" @@ -694,7 +694,7 @@ module "slemicro53_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -708,7 +708,7 @@ module "slemicro54_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "min-slemicro54" + name = "slemicro54-minion" image = "slemicro54-ign" provider_settings = { mac = "aa:b2:93:02:01:c9" @@ -716,7 +716,7 @@ module "slemicro54_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -730,7 +730,7 @@ module "slemicro55_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "min-slemicro55" + name = "slemicro55-minion" image = "slemicro55o" provider_settings = { mac = "aa:b2:93:02:01:ca" @@ -738,7 +738,7 @@ module "slemicro55_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -752,7 +752,7 @@ module "slmicro60_minion" { source = "./modules/minion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "min-slmicro60" + name = "slmicro60-minion" image = "slmicro60o" provider_settings = { mac = "aa:b2:93:02:01:cb" @@ -760,7 +760,7 @@ module "slmicro60_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -774,7 +774,7 @@ module "sles12sp5_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "minssh-sles12sp5" + name = "sles12sp5-sshminion" image = "sles12sp5o" provider_settings = { mac = "aa:b2:93:02:01:d1" @@ -790,7 +790,7 @@ module "sles15sp2_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "minssh-sles15sp2" + name = "sles15sp2-sshminion" image = "sles15sp2o" provider_settings = { mac = "aa:b2:93:02:01:d4" @@ -804,7 +804,7 @@ module "sles15sp3_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "minssh-sles15sp3" + name = "sles15sp3-sshminion" image = "sles15sp3o" provider_settings = { mac = "aa:b2:93:02:01:d5" @@ -818,7 +818,7 @@ module "sles15sp4_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "minssh-sles15sp4" + name = "sles15sp4-sshminion" image = "sles15sp4o" provider_settings = { mac = "aa:b2:93:02:01:d6" @@ -832,7 +832,7 @@ module "sles15sp5_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "minssh-sles15sp5" + name = "sles15sp5-sshminion" image = "sles15sp5o" provider_settings = { mac = "aa:b2:93:02:01:d2" @@ -846,7 +846,7 @@ module "sles15sp6_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "minssh-sles15sp6" + name = "sles15sp6-sshminion" image = "sles15sp6o" provider_settings = { mac = "aa:b2:93:02:01:d0" @@ -860,7 +860,7 @@ module "alma8_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "minssh-alma8" + name = "alma8-sshminion" image = "almalinux8o" provider_settings = { mac = "aa:b2:93:02:01:d9" @@ -877,7 +877,7 @@ module "alma9_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "minssh-alma9" + name = "alma9-sshminion" image = "almalinux9o" provider_settings = { mac = "aa:b2:93:02:01:e2" @@ -894,7 +894,7 @@ module "centos7_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "minssh-centos7" + name = "centos7-sshminion" image = "centos7o" provider_settings = { mac = "aa:b2:93:02:01:d7" @@ -911,7 +911,7 @@ module "oracle9_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "minssh-oracle9" + name = "oracle9-sshminion" image = "oraclelinux9o" provider_settings = { mac = "aa:b2:93:02:01:e3" @@ -928,7 +928,7 @@ module "rocky8_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "minssh-rocky8" + name = "rocky8-sshminion" image = "rocky8o" provider_settings = { mac = "aa:b2:93:02:01:d8" @@ -945,7 +945,7 @@ module "rocky9_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "minssh-rocky9" + name = "rocky9-sshminion" image = "rocky9o" provider_settings = { mac = "aa:b2:93:02:01:e1" @@ -962,7 +962,7 @@ module "ubuntu2004_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "minssh-ubuntu2004" + name = "ubuntu2004-sshminion" image = "ubuntu2004o" provider_settings = { mac = "aa:b2:93:02:01:da" @@ -980,7 +980,7 @@ module "ubuntu2204_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "minssh-ubuntu2204" + name = "ubuntu2204-sshminion" image = "ubuntu2204o" provider_settings = { mac = "aa:b2:93:02:01:db" @@ -994,7 +994,7 @@ module "debian11_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "minssh-debian11" + name = "debian11-sshminion" image = "debian11o" provider_settings = { mac = "aa:b2:93:02:01:de" @@ -1008,7 +1008,7 @@ module "debian12_sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "minssh-debian12" + name = "debian12-sshminion" image = "debian12o" provider_settings = { mac = "aa:b2:93:02:01:dc" @@ -1028,11 +1028,11 @@ module "opensuse155arm_sshminion" { source = "./modules/sshminion" base_configuration = module.base_arm.configuration product_version = "uyuni-master" - name = "nue-minssh-opensuse155arm" + name = "opensuse155arm-sshminion-nue" image = "opensuse155armo" provider_settings = { mac = "aa:b2:93:02:01:e0" - overwrite_fqdn = "uyuni-bv-master-minssh-opensuse155arm.mgr.suse.de" + overwrite_fqdn = "uyuni-bv-master-opensuse155arm-sshminion.mgr.suse.de" memory = 2048 vcpu = 2 xslt = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt") @@ -1048,11 +1048,11 @@ module "opensuse156arm_sshminion" { source = "./modules/sshminion" base_configuration = module.base_arm.configuration product_version = "uyuni-master" - name = "nue-minssh-opensuse156arm" + name = "opensuse156arm-sshminion-nue" image = "opensuse156armo" provider_settings = { mac = "aa:b2:93:02:01:ee" - overwrite_fqdn = "uyuni-bv-master-minssh-opensuse156arm.mgr.suse.de" + overwrite_fqdn = "uyuni-bv-master-opensuse156arm-sshminion.mgr.suse.de" memory = 2048 vcpu = 2 xslt = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt") @@ -1066,7 +1066,7 @@ module "sles15sp5s390_sshminion" { base_configuration = module.base_s390.configuration product_version = "uyuni-master" - name = "minssh-sles15sp5s390" + name = "sles15sp5s390-sshminion" image = "s15s5-minimal-2part-xfs" provider_settings = { @@ -1085,7 +1085,7 @@ module "sles15sp5s390_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_core.configuration // product_version = "uyuni-master" -// name = "minssh-slemicro51" +// name = "slemicro51-sshminion" // image = "slemicro51-ign" // provider_settings = { // mac = "aa:b2:93:02:01:e6" @@ -1100,7 +1100,7 @@ module "sles15sp5s390_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_core.configuration // product_version = "uyuni-master" -// name = "minssh-slemicro52" +// name = "slemicro52-sshminion" // image = "slemicro52-ign" // provider_settings = { // mac = "aa:b2:93:02:01:e7" @@ -1115,7 +1115,7 @@ module "sles15sp5s390_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_core.configuration // product_version = "uyuni-master" -// name = "minssh-slemicro53" +// name = "slemicro53-sshminion" // image = "slemicro53-ign" // provider_settings = { // mac = "aa:b2:93:02:01:e8" @@ -1130,7 +1130,7 @@ module "sles15sp5s390_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_core.configuration // product_version = "uyuni-master" -// name = "minssh-slemicro54" +// name = "slemicro54-sshminion" // image = "slemicro54-ign" // provider_settings = { // mac = "aa:b2:93:02:01:e9" @@ -1145,7 +1145,7 @@ module "sles15sp5s390_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_core.configuration // product_version = "uyuni-master" -// name = "minssh-slemicro55" +// name = "slemicro55-sshminion" // image = "slemicro55o" // provider_settings = { // mac = "aa:b2:93:02:01:ea" @@ -1160,7 +1160,7 @@ module "sles15sp5s390_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_core.configuration // product_version = "uyuni-master" -// name = "minssh-slmicro60" +// name = "slmicro60-sshminion" // image = "slmicro60o" // provider_settings = { // mac = "aa:b2:93:02:01:eb" @@ -1174,7 +1174,7 @@ module "sles12sp5_buildhost" { source = "./modules/build_host" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "build-sles12sp5" + name = "sles12sp5-build" image = "sles12sp5o" provider_settings = { mac = "aa:b2:93:02:01:a4" @@ -1182,7 +1182,7 @@ module "sles12sp5_buildhost" { vcpu = 2 } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -1192,7 +1192,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 @@ -1209,7 +1209,7 @@ module "sles15sp4_buildhost" { source = "./modules/build_host" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "build-sles15sp4" + name = "sles15sp4-build" image = "sles15sp4o" provider_settings = { mac = "aa:b2:93:02:01:a5" @@ -1217,7 +1217,7 @@ module "sles15sp4_buildhost" { vcpu = 2 } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -1227,7 +1227,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 @@ -1251,7 +1251,7 @@ module "monitoring_server" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.suse.de" + hostname = "uyuni-bv-master-proxy.mgr.suse.de" } auto_connect_to_master = false use_os_released_updates = false @@ -1261,7 +1261,7 @@ module "monitoring_server" { module "controller" { source = "./modules/controller" base_configuration = module.base_core.configuration - name = "ctl" + name = "controller" provider_settings = { mac = "aa:b2:93:02:01:a0" memory = 16384 diff --git a/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf b/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf index 973e520d2..a3f705ca4 100644 --- a/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf +++ b/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf @@ -313,7 +313,7 @@ module "server_containerized" { source = "./modules/server_containerized" base_configuration = module.base_core.configuration product_version = "uyuni-master" - name = "srv" + name = "server" image = "leapmicro55o" provider_settings = { mac = "aa:b2:93:04:05:6d" @@ -358,7 +358,7 @@ module "proxy_containerized" { source = "./modules/proxy_containerized" base_configuration = module.base_retail.configuration product_version = "uyuni-master" - name = "pxy" + name = "proxy" provider_settings = { mac = "aa:b2:93:04:05:6e" memory = 4096 @@ -385,14 +385,14 @@ module "sles12sp5_minion" { source = "./modules/minion" base_configuration = module.base_old_sle.configuration product_version = "uyuni-master" - name = "min-sles12sp5" + name = "sles12sp5-minion" image = "sles12sp5o" provider_settings = { mac = "aa:b2:93:04:05:7d" memory = 4096 } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -406,7 +406,7 @@ module "sles15sp2_minion" { source = "./modules/minion" base_configuration = module.base_new_sle.configuration product_version = "uyuni-master" - name = "min-sles15sp2" + name = "sles15sp2-minion" image = "sles15sp2o" provider_settings = { mac = "aa:b2:93:04:05:80" @@ -414,7 +414,7 @@ module "sles15sp2_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -428,7 +428,7 @@ module "sles15sp3_minion" { source = "./modules/minion" base_configuration = module.base_new_sle.configuration product_version = "uyuni-master" - name = "min-sles15sp3" + name = "sles15sp3-minion" image = "sles15sp3o" provider_settings = { mac = "aa:b2:93:04:05:81" @@ -436,7 +436,7 @@ module "sles15sp3_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -450,7 +450,7 @@ module "sles15sp4_minion" { source = "./modules/minion" base_configuration = module.base_new_sle.configuration product_version = "uyuni-master" - name = "min-sles15sp4" + name = "sles15sp4-minion" image = "sles15sp4o" provider_settings = { mac = "aa:b2:93:04:05:82" @@ -458,7 +458,7 @@ module "sles15sp4_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -472,7 +472,7 @@ module "sles15sp5_minion" { source = "./modules/minion" base_configuration = module.base_new_sle.configuration product_version = "uyuni-master" - name = "min-sles15sp5" + name = "sles15sp5-minion" image = "sles15sp5o" provider_settings = { mac = "aa:b2:93:04:05:7e" @@ -480,7 +480,7 @@ module "sles15sp5_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -494,7 +494,7 @@ module "sles15sp6_minion" { source = "./modules/minion" base_configuration = module.base_new_sle.configuration product_version = "uyuni-master" - name = "min-sles15sp6" + name = "sles15sp6-minion" image = "sles15sp6o" provider_settings = { mac = "aa:b2:93:04:05:7c" @@ -502,7 +502,7 @@ module "sles15sp6_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -516,14 +516,14 @@ module "alma8_minion" { source = "./modules/minion" base_configuration = module.base_res.configuration product_version = "uyuni-master" - name = "min-alma8" + name = "alma8-minion" image = "almalinux8o" provider_settings = { mac = "aa:b2:93:04:05:85" memory = 4096 } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -540,14 +540,14 @@ module "alma9_minion" { source = "./modules/minion" base_configuration = module.base_res.configuration product_version = "uyuni-master" - name = "min-alma9" + name = "alma9-minion" image = "almalinux9o" provider_settings = { mac = "aa:b2:93:04:05:8e" memory = 4096 } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -564,14 +564,14 @@ module "centos7_minion" { source = "./modules/minion" base_configuration = module.base_res.configuration product_version = "uyuni-master" - name = "min-centos7" + name = "centos7-minion" image = "centos7o" provider_settings = { mac = "aa:b2:93:04:05:83" memory = 4096 } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -589,14 +589,14 @@ module "oracle9_minion" { source = "./modules/minion" base_configuration = module.base_res.configuration product_version = "uyuni-master" - name = "min-oracle9" + name = "oracle9-minion" image = "oraclelinux9o" provider_settings = { mac = "aa:b2:93:04:05:8f" memory = 4096 } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -613,14 +613,14 @@ module "rocky8_minion" { source = "./modules/minion" base_configuration = module.base_res.configuration product_version = "uyuni-master" - name = "min-rocky8" + name = "rocky8-minion" image = "rocky8o" provider_settings = { mac = "aa:b2:93:04:05:84" memory = 4096 } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -637,14 +637,14 @@ module "rocky9_minion" { source = "./modules/minion" base_configuration = module.base_res.configuration product_version = "uyuni-master" - name = "min-rocky9" + name = "rocky9-minion" image = "rocky9o" provider_settings = { mac = "aa:b2:93:04:05:8d" memory = 4096 } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -661,14 +661,14 @@ module "ubuntu2004_minion" { source = "./modules/minion" base_configuration = module.base_debian.configuration product_version = "uyuni-master" - name = "min-ubuntu2004" + name = "ubuntu2004-minion" image = "ubuntu2004o" provider_settings = { mac = "aa:b2:93:04:05:86" memory = 4096 } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -686,14 +686,14 @@ module "ubuntu2204_minion" { source = "./modules/minion" base_configuration = module.base_debian.configuration product_version = "uyuni-master" - name = "min-ubuntu2204" + name = "ubuntu2204-minion" image = "ubuntu2204o" provider_settings = { mac = "aa:b2:93:04:05:87" memory = 4096 } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -707,7 +707,7 @@ module "debian11_minion" { source = "./modules/minion" base_configuration = module.base_debian.configuration product_version = "uyuni-master" - name = "min-debian11" + name = "debian11-minion" image = "debian11o" provider_settings = { mac = "aa:b2:93:04:05:8a" @@ -715,7 +715,7 @@ module "debian11_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -729,7 +729,7 @@ module "debian12_minion" { source = "./modules/minion" base_configuration = module.base_debian.configuration product_version = "uyuni-master" - name = "min-debian12" + name = "debian12-minion" image = "debian12o" provider_settings = { mac = "aa:b2:93:04:05:88" @@ -737,7 +737,7 @@ module "debian12_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -754,17 +754,17 @@ module "opensuse155arm_minion" { source = "./modules/minion" base_configuration = module.base_arm.configuration product_version = "uyuni-master" - name = "prv-min-opensuse155arm" + name = "opensuse155arm-minion-prv" image = "opensuse155armo" provider_settings = { mac = "aa:b2:92:42:00:0e" - overwrite_fqdn = "uyuni-bv-master-min-opensuse155arm.mgr.prv.suse.net" + overwrite_fqdn = "uyuni-bv-master-opensuse155arm-minion.mgr.prv.suse.net" memory = 2048 vcpu = 2 xslt = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt") } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -778,17 +778,17 @@ module "opensuse156arm_minion" { source = "./modules/minion" base_configuration = module.base_arm.configuration product_version = "uyuni-master" - name = "prv-min-opensuse156arm" + name = "opensuse156arm-minion-prv" image = "opensuse156armo" provider_settings = { mac = "aa:b2:92:42:00:10" - overwrite_fqdn = "uyuni-bv-master-min-opensuse156arm.mgr.prv.suse.net" + overwrite_fqdn = "uyuni-bv-master-opensuse156arm-minion.mgr.prv.suse.net" memory = 2048 vcpu = 2 xslt = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt") } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -800,7 +800,7 @@ module "sles15sp5s390_minion" { base_configuration = module.base_s390.configuration product_version = "uyuni-master" - name = "min-sles15sp5s390" + name = "sles15sp5s390-minion" image = "s15s5-minimal-2part-xfs" provider_settings = { @@ -817,7 +817,7 @@ module "sles15sp5s390_minion" { module "salt_migration_minion" { source = "./modules/minion" base_configuration = module.base_new_sle.configuration - name = "min-salt-migration" + name = "salt-migration-minion" product_version = "uyuni-master" image = "sles15sp5o" provider_settings = { @@ -826,7 +826,7 @@ module "salt_migration_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = true use_os_released_updates = false @@ -842,7 +842,7 @@ module "slemicro51_minion" { source = "./modules/minion" base_configuration = module.base_new_sle.configuration product_version = "uyuni-master" - name = "min-slemicro51" + name = "slemicro51-minion" image = "slemicro51-ign" provider_settings = { mac = "aa:b2:93:04:05:92" @@ -850,7 +850,7 @@ module "slemicro51_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -867,7 +867,7 @@ module "slemicro52_minion" { source = "./modules/minion" base_configuration = module.base_new_sle.configuration product_version = "uyuni-master" - name = "min-slemicro52" + name = "slemicro52-minion" image = "slemicro52-ign" provider_settings = { mac = "aa:b2:93:04:05:93" @@ -875,7 +875,7 @@ module "slemicro52_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -892,7 +892,7 @@ module "slemicro53_minion" { source = "./modules/minion" base_configuration = module.base_new_sle.configuration product_version = "uyuni-master" - name = "min-slemicro53" + name = "slemicro53-minion" image = "slemicro53-ign" provider_settings = { mac = "aa:b2:93:04:05:94" @@ -900,7 +900,7 @@ module "slemicro53_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -917,7 +917,7 @@ module "slemicro54_minion" { source = "./modules/minion" base_configuration = module.base_new_sle.configuration product_version = "uyuni-master" - name = "min-slemicro54" + name = "slemicro54-minion" image = "slemicro54-ign" provider_settings = { mac = "aa:b2:93:04:05:95" @@ -925,7 +925,7 @@ module "slemicro54_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -942,7 +942,7 @@ module "slemicro55_minion" { source = "./modules/minion" base_configuration = module.base_new_sle.configuration product_version = "uyuni-master" - name = "min-slemicro55" + name = "slemicro55-minion" image = "slemicro55o" provider_settings = { mac = "aa:b2:93:04:05:96" @@ -950,7 +950,7 @@ module "slemicro55_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -967,7 +967,7 @@ module "slmicro60_minion" { source = "./modules/minion" base_configuration = module.base_new_sle.configuration product_version = "uyuni-master" - name = "min-slmicro60" + name = "slmicro60-minion" image = "slmicro60o" provider_settings = { mac = "aa:b2:93:04:05:97" @@ -975,7 +975,7 @@ module "slmicro60_minion" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -992,7 +992,7 @@ module "sles12sp5_sshminion" { source = "./modules/sshminion" base_configuration = module.base_old_sle.configuration product_version = "uyuni-master" - name = "minssh-sles12sp5" + name = "sles12sp5-sshminion" image = "sles12sp5o" provider_settings = { mac = "aa:b2:93:04:05:9d" @@ -1011,7 +1011,7 @@ module "sles15sp2_sshminion" { source = "./modules/sshminion" base_configuration = module.base_new_sle.configuration product_version = "uyuni-master" - name = "minssh-sles15sp2" + name = "sles15sp2-sshminion" image = "sles15sp2o" provider_settings = { mac = "aa:b2:93:04:05:a0" @@ -1028,7 +1028,7 @@ module "sles15sp3_sshminion" { source = "./modules/sshminion" base_configuration = module.base_new_sle.configuration product_version = "uyuni-master" - name = "minssh-sles15sp3" + name = "sles15sp3-sshminion" image = "sles15sp3o" provider_settings = { mac = "aa:b2:93:04:05:a1" @@ -1045,7 +1045,7 @@ module "sles15sp4_sshminion" { source = "./modules/sshminion" base_configuration = module.base_new_sle.configuration product_version = "uyuni-master" - name = "minssh-sles15sp4" + name = "sles15sp4-sshminion" image = "sles15sp4o" provider_settings = { mac = "aa:b2:93:04:05:a2" @@ -1062,7 +1062,7 @@ module "sles15sp5_sshminion" { source = "./modules/sshminion" base_configuration = module.base_new_sle.configuration product_version = "uyuni-master" - name = "minssh-sles15sp5" + name = "sles15sp5-sshminion" image = "sles15sp5o" provider_settings = { mac = "aa:b2:93:04:05:9e" @@ -1079,7 +1079,7 @@ module "sles15sp6_sshminion" { source = "./modules/sshminion" base_configuration = module.base_new_sle.configuration product_version = "uyuni-master" - name = "minssh-sles15sp6" + name = "sles15sp6-sshminion" image = "sles15sp6o" provider_settings = { mac = "aa:b2:93:04:05:9c" @@ -1096,7 +1096,7 @@ module "alma8_sshminion" { source = "./modules/sshminion" base_configuration = module.base_res.configuration product_version = "uyuni-master" - name = "minssh-alma8" + name = "alma8-sshminion" image = "almalinux8o" provider_settings = { mac = "aa:b2:93:04:05:a5" @@ -1116,7 +1116,7 @@ module "alma9_sshminion" { source = "./modules/sshminion" base_configuration = module.base_res.configuration product_version = "uyuni-master" - name = "minssh-alma9" + name = "alma9-sshminion" image = "almalinux9o" provider_settings = { mac = "aa:b2:93:04:05:ae" @@ -1136,7 +1136,7 @@ module "centos7_sshminion" { source = "./modules/sshminion" base_configuration = module.base_res.configuration product_version = "uyuni-master" - name = "minssh-centos7" + name = "centos7-sshminion" image = "centos7o" provider_settings = { mac = "aa:b2:93:04:05:a3" @@ -1156,7 +1156,7 @@ module "oracle9_sshminion" { source = "./modules/sshminion" base_configuration = module.base_res.configuration product_version = "uyuni-master" - name = "minssh-oracle9" + name = "oracle9-sshminion" image = "oraclelinux9o" provider_settings = { mac = "aa:b2:93:04:05:af" @@ -1176,7 +1176,7 @@ module "rocky8_sshminion" { source = "./modules/sshminion" base_configuration = module.base_res.configuration product_version = "uyuni-master" - name = "minssh-rocky8" + name = "rocky8-sshminion" image = "rocky8o" provider_settings = { mac = "aa:b2:93:04:05:a4" @@ -1196,7 +1196,7 @@ module "rocky9_sshminion" { source = "./modules/sshminion" base_configuration = module.base_res.configuration product_version = "uyuni-master" - name = "minssh-rocky9" + name = "rocky9-sshminion" image = "rocky9o" provider_settings = { mac = "aa:b2:93:04:05:ad" @@ -1216,7 +1216,7 @@ module "ubuntu2004_sshminion" { source = "./modules/sshminion" base_configuration = module.base_debian.configuration product_version = "uyuni-master" - name = "minssh-ubuntu2004" + name = "ubuntu2004-sshminion" image = "ubuntu2004o" provider_settings = { mac = "aa:b2:93:04:05:a6" @@ -1237,7 +1237,7 @@ module "ubuntu2204_sshminion" { source = "./modules/sshminion" base_configuration = module.base_debian.configuration product_version = "uyuni-master" - name = "minssh-ubuntu2204" + name = "ubuntu2204-sshminion" image = "ubuntu2204o" provider_settings = { mac = "aa:b2:93:04:05:a7" @@ -1254,7 +1254,7 @@ module "debian11_sshminion" { source = "./modules/sshminion" base_configuration = module.base_debian.configuration product_version = "uyuni-master" - name = "minssh-debian11" + name = "debian11-sshminion" image = "debian11o" provider_settings = { mac = "aa:b2:93:04:05:aa" @@ -1271,7 +1271,7 @@ module "debian12_sshminion" { source = "./modules/sshminion" base_configuration = module.base_debian.configuration product_version = "uyuni-master" - name = "minssh-debian12" + name = "debian12-sshminion" image = "debian12o" provider_settings = { mac = "aa:b2:93:04:05:a8" @@ -1291,11 +1291,11 @@ module "opensuse155arm_sshminion" { source = "./modules/sshminion" base_configuration = module.base_arm.configuration product_version = "uyuni-master" - name = "prv-minssh-opensuse155arm" + name = "opensuse155arm-sshminion-prv" image = "opensuse155armo" provider_settings = { mac = "aa:b2:92:42:00:0f" - overwrite_fqdn = "uyuni-bv-master-minssh-opensuse155arm.mgr.prv.suse.net" + overwrite_fqdn = "uyuni-bv-master-opensuse155arm-sshminion.mgr.prv.suse.net" memory = 2048 vcpu = 2 xslt = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt") @@ -1311,11 +1311,11 @@ module "opensuse156arm_sshminion" { source = "./modules/sshminion" base_configuration = module.base_arm.configuration product_version = "uyuni-master" - name = "prv-minssh-opensuse156arm" + name = "opensuse156arm-sshminion-prv" image = "opensuse156armo" provider_settings = { mac = "aa:b2:92:42:00:11" - overwrite_fqdn = "uyuni-bv-master-minssh-opensuse156arm.mgr.prv.suse.net" + overwrite_fqdn = "uyuni-bv-master-opensuse156arm-sshminion.mgr.prv.suse.net" memory = 2048 vcpu = 2 xslt = file("../../susemanager-ci/terracumber_config/tf_files/common/tune-aarch64.xslt") @@ -1329,7 +1329,7 @@ module "sles15sp5s390_sshminion" { base_configuration = module.base_s390.configuration product_version = "uyuni-master" - name = "minssh-sles15sp5s390" + name = "sles15sp5s390-sshminion" image = "s15s5-minimal-2part-xfs" provider_settings = { @@ -1351,7 +1351,7 @@ module "sles15sp5s390_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_new_sle.configuration // product_version = "uyuni-master" -// name = "minssh-slemicro51" +// name = "slemicro51-sshminion" // image = "slemicro51-ign" // provider_settings = { // mac = "aa:b2:93:04:05:b2" @@ -1369,7 +1369,7 @@ module "sles15sp5s390_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_new_sle.configuration // product_version = "uyuni-master" -// name = "minssh-slemicro52" +// name = "slemicro52-sshminion" // image = "slemicro52-ign" // provider_settings = { // mac = "aa:b2:93:04:05:b3" @@ -1387,7 +1387,7 @@ module "sles15sp5s390_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_new_sle.configuration // product_version = "uyuni-master" -// name = "minssh-slemicro53" +// name = "slemicro53-sshminion" // image = "slemicro53-ign" // provider_settings = { // mac = "aa:b2:93:04:05:b4" @@ -1405,7 +1405,7 @@ module "sles15sp5s390_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_new_sle.configuration // product_version = "uyuni-master" -// name = "minssh-slemicro54" +// name = "slemicro54-sshminion" // image = "slemicro54-ign" // provider_settings = { // mac = "aa:b2:93:04:05:b5" @@ -1423,7 +1423,7 @@ module "sles15sp5s390_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_new_sle.configuration // product_version = "uyuni-master" -// name = "minssh-slemicro55" +// name = "slemicro55-sshminion" // image = "slemicro55o" // provider_settings = { // mac = "aa:b2:93:04:05:b6" @@ -1441,7 +1441,7 @@ module "sles15sp5s390_sshminion" { // source = "./modules/sshminion" // base_configuration = module.base_new_sle.configuration // product_version = "uyuni-master" -// name = "minssh-slmicro60" +// name = "slmicro60-sshminion" // image = "slmicro60o" // provider_settings = { // mac = "aa:b2:93:04:05:b7" @@ -1458,7 +1458,7 @@ module "sles12sp5_buildhost" { source = "./modules/build_host" base_configuration = module.base_retail.configuration product_version = "uyuni-master" - name = "build-sles12sp5" + name = "sles12sp5-build" image = "sles12sp5o" provider_settings = { mac = "aa:b2:93:04:05:70" @@ -1466,7 +1466,7 @@ module "sles12sp5_buildhost" { vcpu = 2 } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -1479,7 +1479,7 @@ module "sles12sp5_terminal" { } source = "./modules/pxe_boot" base_configuration = module.base_retail.configuration - name = "terminal-sles12sp5" + name = "sles12sp5-terminional" image = "sles12sp5o" provider_settings = { memory = 2048 @@ -1498,7 +1498,7 @@ module "sles15sp4_buildhost" { source = "./modules/build_host" base_configuration = module.base_retail.configuration product_version = "uyuni-master" - name = "build-sles15sp4" + name = "sles15sp4-build" image = "sles15sp4o" provider_settings = { mac = "aa:b2:93:04:05:71" @@ -1506,7 +1506,7 @@ module "sles15sp4_buildhost" { vcpu = 2 } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -1519,7 +1519,7 @@ module "sles15sp4_terminal" { } source = "./modules/pxe_boot" base_configuration = module.base_retail.configuration - name = "terminal-sles15sp4" + name = "sles15sp4-terminional" image = "sles15sp4o" provider_settings = { memory = 2048 @@ -1546,7 +1546,7 @@ module "monitoring_server" { } server_configuration = { - hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net" + hostname = "uyuni-bv-master-proxy.mgr.prv.suse.net" } auto_connect_to_master = false use_os_released_updates = false @@ -1556,7 +1556,7 @@ module "monitoring_server" { module "controller" { source = "./modules/controller" base_configuration = module.base_core.configuration - name = "ctl" + name = "controller" provider_settings = { mac = "aa:b2:93:04:05:6c" memory = 16384 From d20d987de3f11a582bd7a9b6bff7a33dbe0aaf37 Mon Sep 17 00:00:00 2001 From: Maxime Noel Date: Wed, 25 Sep 2024 09:25:07 +1200 Subject: [PATCH 2/3] Push space --- terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf b/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf index a3f705ca4..0fe7a2c22 100644 --- a/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf +++ b/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf @@ -1565,6 +1565,7 @@ module "controller" { swap_file_size = null product_version = "uyuni-master" + // Cucumber repository configuration for the controller git_username = var.GIT_USER git_password = var.GIT_PASSWORD From af5f5a7c3e8e8e4a532d1fe9ba2ef7d5001293ed Mon Sep 17 00:00:00 2001 From: Maxime Noel Date: Wed, 25 Sep 2024 09:25:45 +1200 Subject: [PATCH 3/3] Update hostname main.tf for uyuniNUEBV uyuniPRVBV 50PRVBV --- terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf | 1 - 1 file changed, 1 deletion(-) diff --git a/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf b/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf index 0fe7a2c22..a3f705ca4 100644 --- a/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf +++ b/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf @@ -1565,7 +1565,6 @@ module "controller" { swap_file_size = null product_version = "uyuni-master" - // Cucumber repository configuration for the controller git_username = var.GIT_USER git_password = var.GIT_PASSWORD