Skip to content

Commit

Permalink
Enable Liberty 9 in BV again
Browse files Browse the repository at this point in the history 
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 <dominik.gedon@suse.com>
  • Loading branch information
@nodeg
nodeg committed Sep 2, 2024
1 parent e6bef6f commit ea42a5b
Show file tree
Hide file tree
Showing 4 changed files with 105 additions and 83 deletions.
86 changes: 45 additions & 41 deletions terracumber_config/tf_files/SUSEManager-4.3-build-validation-NUE.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
14 changes: 10 additions & 4 deletions terracumber_config/tf_files/SUSEManager-4.3-build-validation-PRV.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down Expand Up @@ -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" {
Expand Down
74 changes: 40 additions & 34 deletions terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
14 changes: 10 additions & 4 deletions terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down Expand Up @@ -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" {
Expand Down

0 comments on commit ea42a5b

Please sign in to comment.