Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable Liberty 9 again in our BV #1330

Merged
merged 2 commits into from
Sep 2, 2024
Merged

Enable Liberty 9 again in our BV #1330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea42a5b
Enable Liberty 9 in BV again
nodeg Aug 29, 2024
407d1fb
Enable Salt bundle on Liberty 9
nodeg Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 39 additions & 41 deletions terracumber_config/tf_files/SUSEManager-4.3-build-validation-NUE.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,27 +533,27 @@ 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"

additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}

module "oracle9_minion" {
source = "./modules/minion"
Expand Down Expand Up @@ -1084,23 +1084,22 @@ 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"

additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}

module "oracle9_ssh_minion" {
source = "./modules/sshminion"
Expand Down Expand Up @@ -1527,9 +1526,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
76 changes: 38 additions & 38 deletions terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,26 +416,26 @@ 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"
//
// additional_packages = [ "venv-salt-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"

additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}

module "oracle9-minion" {
source = "./modules/minion"
Expand Down Expand Up @@ -1006,22 +1006,22 @@ 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"
//
// additional_packages = [ "venv-salt-minion" ]
// install_salt_bundle = true
//}
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"

additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}

module "oracle9-sshminion" {
source = "./modules/sshminion"
Expand Down Expand Up @@ -1501,8 +1501,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
Loading