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 92f4f0ac1..d3d2ae03e 100644 --- a/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf +++ b/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf @@ -459,6 +459,10 @@ module "ubuntu2004-minion" { auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" + + # WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637 + additional_packages = [ "venv-salt-minion" ] + install_salt_bundle = true } module "ubuntu2204-minion" { @@ -479,8 +483,6 @@ module "ubuntu2204-minion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -// Debian 9 is not supported by 4.3 - module "debian10-minion" { source = "./modules/minion" base_configuration = module.base_core.configuration @@ -498,6 +500,10 @@ module "debian10-minion" { auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" + + # WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637 + additional_packages = [ "venv-salt-minion" ] + install_salt_bundle = true } module "debian11-minion" { @@ -865,6 +871,10 @@ module "ubuntu2004-sshminion" { } use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" + + # WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637 + additional_packages = [ "venv-salt-minion" ] + install_salt_bundle = true } module "ubuntu2204-sshminion" { @@ -881,8 +891,6 @@ module "ubuntu2204-sshminion" { ssh_key_path = "./salt/controller/id_rsa.pub" } -// Debian 9 is not supported by 4.3 - module "debian10-sshminion" { source = "./modules/sshminion" base_configuration = module.base_core.configuration @@ -895,6 +903,10 @@ module "debian10-sshminion" { } use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" + + # WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637 + additional_packages = [ "venv-salt-minion" ] + install_salt_bundle = true } module "debian11-sshminion" { 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 ad0bbdc53..1264a7405 100644 --- a/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf +++ b/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf @@ -646,6 +646,10 @@ module "ubuntu2004-minion" { auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" + + # WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637 + additional_packages = [ "venv-salt-minion" ] + install_salt_bundle = true } module "ubuntu2204-minion" { @@ -691,6 +695,10 @@ module "debian10-minion" { auto_connect_to_master = false use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" + + # WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637 + additional_packages = [ "venv-salt-minion" ] + install_salt_bundle = true } module "debian11-minion" { @@ -1113,6 +1121,10 @@ module "ubuntu2004-sshminion" { } use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" + + # WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637 + additional_packages = [ "venv-salt-minion" ] + install_salt_bundle = true } module "ubuntu2204-sshminion" { @@ -1149,6 +1161,10 @@ module "debian10-sshminion" { } use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" + + # WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637 + additional_packages = [ "venv-salt-minion" ] + install_salt_bundle = true } module "debian11-sshminion" {