diff --git a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-AWS.tf b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-AWS.tf index cb6d2174a..9586722ff 100644 --- a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-AWS.tf +++ b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-AWS.tf @@ -340,6 +340,22 @@ module "ubuntu2004_minion" { } } +module "rhel9_minion" { + source = "./modules/minion" + base_configuration = module.base.configuration + server_configuration = module.server.configuration + product_version = "4.3-released" + name = "min-rhel9" + image = "rhel9" + auto_connect_to_master = false + use_os_released_updates = false + ssh_key_path = "./salt/controller/id_rsa.pub" + install_salt_bundle = true + provider_settings = { + instance_type = "t3a.medium" + } +} + module "rocky8_minion" { source = "./modules/minion" base_configuration = module.base.configuration @@ -590,26 +606,6 @@ module "sles15sp6_sshminion" { } } -module "rhel9_minion" { - - source = "./modules/minion" - base_configuration = module.base.configuration - server_configuration = module.server.configuration - product_version = "4.3-released" - name = "min-rhel9" - image = "rhel9" - auto_connect_to_master = false - use_os_released_updates = false - ssh_key_path = "./salt/controller/id_rsa.pub" - install_salt_bundle = true - provider_settings = { - instance_type = "t3a.medium" - } - - //rhel9-minion_additional_repos - -} - module "ubuntu2204_sshminion" { source = "./modules/sshminion" base_configuration = module.base.configuration @@ -690,6 +686,8 @@ module "controller" { sle15sp6_minion_configuration = module.sles15sp6_minion.configuration sle15sp6_sshminion_configuration = module.sles15sp6_sshminion.configuration + rhel9_minion_configuration = module.rhel9_minion.configuration + rocky8_minion_configuration = module.rocky8_minion.configuration rocky8_sshminion_configuration = module.rocky8_sshminion.configuration @@ -704,9 +702,6 @@ module "controller" { // debian12_minion_configuration = module.debian12_minion.configuration // debian12_sshminion_configuration = module.debian12_sshminion.configuration - - rhel9_minion_configuration = module.rhel9_minion.configuration - } output "bastion_public_name" { 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 6a63bd5e5..b890b491e 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 @@ -1445,12 +1445,14 @@ module "controller" { centos7_minion_configuration = module.centos7_minion.configuration centos7_sshminion_configuration = module.centos7_sshminion.configuration - liberty9_minion_configuration = module.liberty9_minion.configuration - liberty9_sshminion_configuration = module.liberty9_sshminion.configuration + liberty9_minion_configuration = module.liberty9_minion.configuration + liberty9_sshminion_configuration = module.liberty9_sshminion.configuration oracle9_minion_configuration = module.oracle9_minion.configuration oracle9_sshminion_configuration = module.oracle9_sshminion.configuration + // rhel9 is tested only in AWS for legal reasons + rocky8_minion_configuration = module.rocky8_minion.configuration rocky8_sshminion_configuration = module.rocky8_sshminion.configuration diff --git a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-PRV.tf b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-PRV.tf index e462103dd..5d4cd7fa6 100644 --- a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-PRV.tf +++ b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-PRV.tf @@ -1792,6 +1792,8 @@ module "controller" { oracle9_minion_configuration = module.oracle9_minion.configuration oracle9_sshminion_configuration = module.oracle9_sshminion.configuration + // rhel9 is tested only in AWS for legal reasons + rocky8_minion_configuration = module.rocky8_minion.configuration rocky8_sshminion_configuration = module.rocky8_sshminion.configuration