Update module name. Replace PR for 5.0 NUE module renaming.

SUSE · Sep 16, 2024 · 6b32c23 · 6b32c23
1 parent 743e77b
commit 6b32c23
Show file tree

Hide file tree

Showing 2 changed files with 156 additions and 157 deletions.
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
@@ -533,27 +533,26 @@ module "centos7_minion" {
   install_salt_bundle = true
 }
 
+module "liberty9_minion" {
+  source             = "./modules/minion"
+  base_configuration = module.base_core.configuration
+  product_version    = "4.3-released"
+  name               = "liberty9-minion"
+  image              = "libertylinux9o"
+  provider_settings = {
+    mac                = "aa:b2:92:42:00:c5"
+    memory             = 4096
+  }
+  server_configuration = {
+    hostname = "suma-bv-43-proxy.mgr.suse.de"
+  }
+  auto_connect_to_master  = false
+  use_os_released_updates = false
+  ssh_key_path            = "./salt/controller/id_rsa.pub"
 
-# module "liberty9_minion" {
-#   source             = "./modules/minion"
-#   base_configuration = module.base_core.configuration
-#   product_version    = "4.3-released"
-#   name               = "liberty9-minion"
-#   image              = "libertylinux9o"
-#   provider_settings = {
-#     mac                = "aa:b2:92:42:00:c5"
-#     memory             = 4096
-#   }
-#   server_configuration = {
-#     hostname = "suma-bv-43-proxy.mgr.suse.de"
-#   }
-#   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
-# }
+  additional_packages = [ "venv-salt-minion" ]
+  install_salt_bundle = true
+}
 
 module "oracle9_minion" {
   source             = "./modules/minion"
@@ -1060,22 +1059,22 @@ module "centos7_sshminion" {
   install_salt_bundle = true
 }
 
-# module "liberty9_sshminion" {
-#   source             = "./modules/sshminion"
-#   base_configuration = module.base_core.configuration
-#   product_version    = "4.3-released"
-#   name               = "liberty9-sshminion"
-#   image              = "libertylinux9o"
-#   provider_settings = {
-#     mac                = "aa:b2:92:42:00:e5"
-#     memory             = 4096
-#   }
-#   use_os_released_updates = false
-#   ssh_key_path            = "./salt/controller/id_rsa.pub"
-#
-#   additional_packages = [ "venv-salt-minion" ]
-#   install_salt_bundle = true
-# }
+module "liberty9_sshminion" {
+  source             = "./modules/sshminion"
+  base_configuration = module.base_core.configuration
+  product_version    = "4.3-released"
+  name               = "liberty9-sshminion"
+  image              = "libertylinux9o"
+  provider_settings = {
+    mac                = "aa:b2:92:42:00:e5"
+    memory             = 4096
+  }
+  use_os_released_updates = false
+  ssh_key_path            = "./salt/controller/id_rsa.pub"
+
+  additional_packages = [ "venv-salt-minion" ]
+  install_salt_bundle = true
+}
 
 module "oracle9_sshminion" {
   source             = "./modules/sshminion"
@@ -1483,8 +1482,8 @@ module "controller" {
   centos7_minion_configuration    = module.centos7_minion.configuration
   centos7_sshminion_configuration = module.centos7_sshminion.configuration
 
-#  liberty9_minion_configuration    = module.liberty9_minion.configuration
-#  liberty9_sshminion_configuration = module.liberty9_sshminion.configuration
+ liberty9_minion_configuration    = module.liberty9_minion.configuration
+ liberty9_sshminion_configuration = module.liberty9_sshminion.configuration
 
   oracle9_minion_configuration    = module.oracle9_minion.configuration
   oracle9_sshminion_configuration = module.oracle9_sshminion.configuration