Fix DHCP and DNS server setup

SUSE · Apr 1, 2024 · 7fc5726 · 7fc5726
1 parent 55e181a
commit 7fc5726
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/.github/workflows/sumaform-validation.yml b/.github/workflows/sumaform-validation.yml
@@ -79,6 +79,10 @@ jobs:
           cd sumaform
           ln -sfn ../backend_modules/null modules/backend
 
+          # Provide a fake private SSH key
+          mkdir -p ~/.ssh
+          touch ~/.ssh/id_rsa
+
           for tf_file in ${{steps.tf_files.outputs.added_modified}}; do
             echo "::notice::Validating '`basename $tf_file`'..."
             cp ../$tf_file main.tf

diff --git a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf
@@ -1307,7 +1307,16 @@ module "dhcp-dns" {
   base_configuration = module.base_core.configuration
   name               = "dhcp-dns"
   image              = "opensuse155o"
-  private_hosts      = [ module.proxy_containerized.configuration, module.sles12sp5-terminal.configuration, module.sles15sp4-terminal.configuration ]
+  private_hosts = [
+    module.proxy_containerized.configuration,
+    module.sles12sp5-terminal.configuration,
+    module.sles15sp4-terminal.configuration
+  ]
+  hypervisor = {
+    host        = "suma-06.mgr.suse.de"
+    user        = "root"
+    private_key = file("~/.ssh/id_rsa")
+  }
 }
 
 module "monitoring-server" {

diff --git a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf
@@ -351,7 +351,7 @@ module "proxy_containerized" {
     libvirt = libvirt.terminus
   }
   source             = "./modules/proxy_containerized"
-  base_configuration = module.base_core.configuration
+  base_configuration = module.base_retail.configuration
   product_version    = "head"
   name               = "pxy"
   provider_settings = {
@@ -1592,10 +1592,19 @@ module "sles15sp4-terminal" {
 
 module "dhcp-dns" {
   source             = "./modules/dhcp_dns"
-  base_configuration = module.base_core.configuration
+  base_configuration = module.base_retail.configuration
   name               = "dhcp-dns"
   image              = "opensuse155o"
-  private_hosts      = [ module.proxy_containerized.configuration, module.sles12sp5-terminal.configuration, module.sles15sp4-terminal.configuration ]
+  private_hosts = [
+    module.proxy_containerized.configuration,
+    module.sles12sp5-terminal.configuration,
+    module.sles15sp4-terminal.configuration
+  ]
+  hypervisor = {
+    host        = "terminus.mgr.prv.suse.net"
+    user        = "root"
+    private_key = file("~/.ssh/id_rsa")
+  }
 }
 
 module "monitoring-server" {