From d99ae5863c742b276b461b85a8c5eea2ac80dc2c Mon Sep 17 00:00:00 2001 From: Dominik Gedon Date: Thu, 29 Aug 2024 15:02:04 +0200 Subject: [PATCH] Enable Libery 9 again but without installing the Salt bundle. The SUMA server will take care of this. We cannot install it anymore since we do not register Liberty 9 with RMT anymore. Signed-off-by: Dominik Gedon --- .../SUSEManager-4.3-build-validation-NUE.tf | 86 ++++++++++--------- .../SUSEManager-4.3-build-validation-PRV.tf | 14 ++- .../SUSEManager-5.0-build-validation-NUE.tf | 74 ++++++++-------- .../SUSEManager-5.0-build-validation-PRV.tf | 14 ++- 4 files changed, 105 insertions(+), 83 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 index 1a5aa3432..07bc4bfde 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 @@ -533,27 +533,30 @@ module "centos7_minion" { install_salt_bundle = true } -# Temporarily disabled du to issues on rmt.scc.suse.de -# module "liberty9_minion" { -# source = "./modules/minion" -# base_configuration = module.base_core.configuration -# product_version = "4.3-released" -# name = "min-liberty9" -# image = "libertylinux9o" -# provider_settings = { -# mac = "aa:b2:92:42:00:c5" -# memory = 4096 -# } -# server_configuration = { -# hostname = "suma-bv-43-pxy.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 -# } + +module "liberty9_minion" { + source = "./modules/minion" + base_configuration = module.base_core.configuration + product_version = "4.3-released" + name = "min-liberty9" + image = "libertylinux9o" + provider_settings = { + mac = "aa:b2:92:42:00:c5" + memory = 4096 + } + server_configuration = { + hostname = "suma-bv-43-pxy.mgr.suse.de" + } + auto_connect_to_master = false + use_os_released_updates = false + ssh_key_path = "./salt/controller/id_rsa.pub" + +// disabled since we do not register Liberty with an RMT server +// so we do not have a repository available to install the Salt +// Bundle from +// additional_packages = [ "venv-salt-minion" ] +// install_salt_bundle = true +} module "oracle9_minion" { source = "./modules/minion" @@ -1084,23 +1087,25 @@ module "centos7_ssh_minion" { install_salt_bundle = true } -# Temporarily disabled du to issues on rmt.scc.suse.de -# module "liberty9_ssh_minion" { -# source = "./modules/sshminion" -# base_configuration = module.base_core.configuration -# product_version = "4.3-released" -# name = "minssh-liberty9" -# 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_ssh_minion" { + source = "./modules/sshminion" + base_configuration = module.base_core.configuration + product_version = "4.3-released" + name = "minssh-liberty9" + 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" + +// disabled since we do not register Liberty with an RMT server +// so we do not have a repository available to install the Salt +// Bundle from +// additional_packages = [ "venv-salt-minion" ] +// install_salt_bundle = true +} module "oracle9_ssh_minion" { source = "./modules/sshminion" @@ -1527,9 +1532,8 @@ module "controller" { centos7_minion_configuration = module.centos7_minion.configuration centos7_sshminion_configuration = module.centos7_ssh_minion.configuration -# Temporarily disabled du to issues on rmt.scc.suse.de -# liberty9_minion_configuration = module.liberty9_minion.configuration -# liberty9_sshminion_configuration = module.liberty9_ssh_minion.configuration + liberty9_minion_configuration = module.liberty9_minion.configuration + liberty9_sshminion_configuration = module.liberty9_ssh_minion.configuration oracle9_minion_configuration = module.oracle9_minion.configuration oracle9_sshminion_configuration = module.oracle9_ssh_minion.configuration 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 e27115e9f..2b730977e 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 @@ -750,8 +750,11 @@ module "liberty9_minion" { use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true +// disabled since we do not register Liberty with an RMT server +// so we do not have a repository available to install the Salt +// Bundle from +// additional_packages = [ "venv-salt-minion" ] +// install_salt_bundle = true } module "oracle9_minion" { @@ -1368,8 +1371,11 @@ module "liberty9_ssh_minion" { use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true +// disabled since we do not register Liberty with an RMT server +// so we do not have a repository available to install the Salt +// Bundle from +// additional_packages = [ "venv-salt-minion" ] +// install_salt_bundle = true } module "oracle9_ssh_minion" { 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 index 14edcbd74..a6e00ce4b 100644 --- a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf +++ b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf @@ -416,26 +416,29 @@ module "centos7-minion" { install_salt_bundle = true } -//module "liberty9-minion" { -// source = "./modules/minion" -// base_configuration = module.base_core.configuration -// product_version = "5.0-released" -// name = "min-liberty9" -// image = "libertylinux9o" -// provider_settings = { -// mac = "aa:b2:92:42:00:75" -// memory = 4096 -// } -// server_configuration = { -// hostname = "suma-bv-50-srv.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 = "5.0-released" + name = "min-liberty9" + image = "libertylinux9o" + provider_settings = { + mac = "aa:b2:92:42:00:75" + memory = 4096 + } + server_configuration = { + hostname = "suma-bv-50-srv.mgr.suse.de" + } + auto_connect_to_master = false + use_os_released_updates = false + ssh_key_path = "./salt/controller/id_rsa.pub" + +// disabled since we do not register Liberty with an RMT server +// so we do not have a repository available to install the Salt +// Bundle from // additional_packages = [ "venv-salt-minion" ] // install_salt_bundle = true -//} +} module "oracle9-minion" { source = "./modules/minion" @@ -1006,22 +1009,25 @@ module "centos7-sshminion" { } -//module "liberty9-sshminion" { -// source = "./modules/sshminion" -// base_configuration = module.base_core.configuration -// product_version = "5.0-released" -// name = "minssh-liberty9" -// image = "libertylinux9o" -// provider_settings = { -// mac = "aa:b2:92:42:00:95" -// memory = 4096 -// } -// use_os_released_updates = false -// ssh_key_path = "./salt/controller/id_rsa.pub" -// +module "liberty9-sshminion" { + source = "./modules/sshminion" + base_configuration = module.base_core.configuration + product_version = "5.0-released" + name = "minssh-liberty9" + image = "libertylinux9o" + provider_settings = { + mac = "aa:b2:92:42:00:95" + memory = 4096 + } + use_os_released_updates = false + ssh_key_path = "./salt/controller/id_rsa.pub" + +// disabled since we do not register Liberty with an RMT server +// so we do not have a repository available to install the Salt +// Bundle from // additional_packages = [ "venv-salt-minion" ] // install_salt_bundle = true -//} +} module "oracle9-sshminion" { source = "./modules/sshminion" @@ -1501,8 +1507,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 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 index 5800ccd57..a0cc57032 100644 --- a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf +++ b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf @@ -612,8 +612,11 @@ module "liberty9_minion" { use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true +// disabled since we do not register Liberty with an RMT server +// so we do not have a repository available to install the Salt +// Bundle from +// additional_packages = [ "venv-salt-minion" ] +// install_salt_bundle = true } module "oracle9_minion" { @@ -1267,8 +1270,11 @@ module "liberty9_ssh_minion" { use_os_released_updates = false ssh_key_path = "./salt/controller/id_rsa.pub" - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true +// disabled since we do not register Liberty with an RMT server +// so we do not have a repository available to install the Salt +// Bundle from +// additional_packages = [ "venv-salt-minion" ] +// install_salt_bundle = true } module "oracle9_ssh_minion" {