Add workaround for Deblike minions in Uyuni BV

Signed-off-by: Dominik Gedon <dominik.gedon@suse.com>
SUSE · Oct 20, 2023 · a1483de · a1483de
1 parent 981aee0
commit a1483de
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 0 deletions.
diff --git 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" {
@@ -496,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" {
@@ -515,6 +523,10 @@ module "debian11-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 "debian12-minion" {
@@ -863,6 +875,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" {
@@ -891,6 +907,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" {
@@ -905,6 +925,10 @@ module "debian11-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 "debian12-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
@@ -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" {
@@ -713,6 +721,10 @@ module "debian11-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 "debian12-minion" {
@@ -1113,6 +1125,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 +1165,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" {
@@ -1166,6 +1186,10 @@ module "debian11-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 "debian12-sshminion" {