Support additionnal disks server containerized cucumber testsuite (#1744

)
uyuni-project · Nov 13, 2024 · 1040f4d · 1040f4d
1 parent c540e04
commit 1040f4d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/modules/cucumber_testsuite/main.tf b/modules/cucumber_testsuite/main.tf
@@ -163,6 +163,8 @@ module "server_containerized" {
   provider_settings             = lookup(local.provider_settings_by_host, "server_containerized", {})
   server_mounted_mirror         = lookup(local.server_mounted_mirror, "server_containerized", {})
   main_disk_size                = lookup(local.main_disk_size, "server_containerized", 200)
+  repository_disk_size          = lookup(local.repository_disk_size, "server", 0)
+  database_disk_size            = lookup(local.database_disk_size, "server", 0)
   large_deployment              = lookup(local.large_deployment, "server_containerized", false)
 }
 
@@ -189,11 +191,12 @@ module "proxy" {
   ssh_key_path              = "./salt/controller/id_rsa.pub"
   install_salt_bundle = lookup(local.install_salt_bundle, "proxy", false)
 
-  additional_repos  = lookup(local.additional_repos, "proxy", {})
-  additional_repos_only  = lookup(local.additional_repos_only, "proxy", false)
-  additional_packages = lookup(local.additional_packages, "proxy", [])
-  main_disk_size      = lookup(local.main_disk_size, "proxy", 200)
-  provider_settings = lookup(local.provider_settings_by_host, "proxy", {})
+  additional_repos      = lookup(local.additional_repos, "proxy", {})
+  additional_repos_only = lookup(local.additional_repos_only, "proxy", false)
+  additional_packages   = lookup(local.additional_packages, "proxy", [])
+  main_disk_size        = lookup(local.main_disk_size, "proxy", 200)
+  repository_disk_size  = lookup(local.repository_disk_size, "proxy", 0)
+  provider_settings     = lookup(local.provider_settings_by_host, "proxy", {})
 }
 
 module "proxy_containerized" {
@@ -225,9 +228,8 @@ module "proxy_containerized" {
   additional_repos_only  = lookup(local.additional_repos_only, "proxy_containerized", false)
   additional_packages    = lookup(local.additional_packages, "proxy_containerized", [])
   main_disk_size         = lookup(local.main_disk_size, "proxy_containerized", 200)
-  provider_settings      = lookup(local.provider_settings_by_host, "proxy_containerized", {})
   repository_disk_size   = lookup(local.repository_disk_size, "proxy_containerized", 0)
-  database_disk_size     = lookup(local.database_disk_size, "proxy_containerized", 0)
+  provider_settings      = lookup(local.provider_settings_by_host, "proxy_containerized", {})
 }
 
 module "dhcp-dns" {

diff --git a/modules/proxy/variables.tf b/modules/proxy/variables.tf
@@ -131,7 +131,7 @@ variable "main_disk_size" {
 }
 
 variable "repository_disk_size" {
-  description = "Size of an aditional disk for /var/spacewalk partition, defined in GiB"
+  description = "Size of an additional disk for /var/spacewalk partition, defined in GiB"
   default     = 0
 }