From 00456da33e896609ca358df1702e943eaa5fbe75 Mon Sep 17 00:00:00 2001
From: Eric Bischoff <ebischoff@suse.com>
Date: Fri, 13 Oct 2023 14:58:55 +0200
Subject: [PATCH] Debian 12 is bundle-only

---
 .../tf_files/SUSEManager-4.3-build-validation-AWS.tf        | 6 ++++++
 .../tf_files/SUSEManager-4.3-build-validation-NUE.tf        | 6 ++++++
 .../tf_files/SUSEManager-4.3-build-validation-PRV.tf        | 3 +++
 .../tf_files/Uyuni-Master-build-validation-NUE.tf           | 6 ++++++
 .../tf_files/Uyuni-Master-build-validation-PRV.tf           | 6 ++++++
 5 files changed, 27 insertions(+)

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 438e9cb65..77e3a80fd 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
@@ -354,6 +354,9 @@ module "ubuntu2004-minion" {
 //  provider_settings = {
 //    instance_type = "t3a.medium"
 //  }
+//
+//  additional_packages = [ "venv-salt-minion" ]
+//  install_salt_bundle = true
 //}
 
 module "rocky8-minion" {
@@ -500,6 +503,9 @@ module "ubuntu2004-sshminion" {
 //  provider_settings = {
 //    instance_type = "t3a.medium"
 //  }
+//
+//  additional_packages = [ "venv-salt-minion" ]
+//  install_salt_bundle = true
 //}
 
 module "rocky8-sshminion" {
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 8609ef186..7d543eb8b 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
@@ -701,6 +701,9 @@ module "debian12-minion" {
   auto_connect_to_master  = false
   use_os_released_updates = false
   ssh_key_path            = "./salt/controller/id_rsa.pub"
+
+  additional_packages = [ "venv-salt-minion" ]
+  install_salt_bundle = true
 }
 
 // WORKAROUND: overdrive3 has been disconnected by mistake
@@ -1102,6 +1105,9 @@ module "debian12-sshminion" {
   }
   use_os_released_updates = false
   ssh_key_path            = "./salt/controller/id_rsa.pub"
+
+  additional_packages = [ "venv-salt-minion" ]
+  install_salt_bundle = true
 }
 
 // WORKAROUND: overdrive3 has been disconnected by mistake
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 53e95a207..a9fa80207 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
@@ -1407,6 +1407,9 @@ module "debian12-sshminion" {
   }
   use_os_released_updates = false
   ssh_key_path            = "./salt/controller/id_rsa.pub"
+
+  additional_packages = [ "venv-salt-minion" ]
+  install_salt_bundle = true
 }
 
 module "opensuse154arm-sshminion" {
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 30966d446..92f4f0ac1 100644
--- a/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf
+++ b/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf
@@ -536,6 +536,9 @@ module "debian12-minion" {
   auto_connect_to_master  = false
   use_os_released_updates = false
   ssh_key_path            = "./salt/controller/id_rsa.pub"
+
+  additional_packages = [ "venv-salt-minion" ]
+  install_salt_bundle = true
 }
 
 // WORKAROUND: overdrive3 has been disconnected by mistake
@@ -920,6 +923,9 @@ module "debian12-sshminion" {
   }
   use_os_released_updates = false
   ssh_key_path            = "./salt/controller/id_rsa.pub"
+
+  additional_packages = [ "venv-salt-minion" ]
+  install_salt_bundle = true
 }
 
 // WORKAROUND: overdrive3 has been disconnected by mistake
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 d7d08f612..ad0bbdc53 100644
--- a/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf
+++ b/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf
@@ -735,6 +735,9 @@ module "debian12-minion" {
   auto_connect_to_master  = false
   use_os_released_updates = false
   ssh_key_path            = "./salt/controller/id_rsa.pub"
+
+  additional_packages = [ "venv-salt-minion" ]
+  install_salt_bundle = true
 }
 
 module "opensuse154arm-minion" {
@@ -1180,6 +1183,9 @@ module "debian12-sshminion" {
   }
   use_os_released_updates = false
   ssh_key_path            = "./salt/controller/id_rsa.pub"
+
+  additional_packages = [ "venv-salt-minion" ]
+  install_salt_bundle = true
 }
 
 module "opensuse154arm-sshminion" {