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

Uyuni BV updates #1295

Merged
merged 3 commits into from
Aug 14, 2024
Merged

Uyuni BV updates #1295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c831b77
Fix server and proxy module in Uyuni BV
nodeg Aug 14, 2024
e42a052
Align server/proxy config in Uyuni BV with 5.0
nodeg Aug 14, 2024
73aec8b
Uyuni BV: Remove unsupported argument
nodeg Aug 14, 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
24 changes: 6 additions & 18 deletions terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ module "base_s390" {
}

module "server_containerized" {
source = "./modules/server"
nodeg marked this conversation as resolved.
Show resolved Hide resolved
source = "./modules/server_containerized"
base_configuration = module.base_core.configuration
product_version = "uyuni-master"
name = "srv"
Expand All @@ -182,36 +182,31 @@ module "server_containerized" {

java_debugging = false
auto_accept = false
monitored = true
disable_firewall = false
allow_postgres_connections = false
skip_changelog_import = false
create_first_user = false
mgr_sync_autologin = false
create_sample_channel = false
create_sample_activation_key = false
create_sample_bootstrap_script = false
publish_private_ssl_key = false
use_os_released_updates = true
disable_download_tokens = false
disable_auto_bootstrap = true
large_deployment = true
ssh_key_path = "./salt/controller/id_rsa.pub"
from_email = "root@suse.de"
accept_all_ssl_protocols = true

runtime = "podman"
container_repository = "registry.opensuse.org/systemsmanagement/uyuni/master/containers/uyuni"
container_tag = "latest"
helm_chart_url = "oci://registry.opensuse.org/systemsmanagement/uyuni/master/charts/uyuni/server"
login_timeout = 28800

//server_additional_repos

}

module "proxy_containerized" {
source = "./modules/proxy"
source = "./modules/proxy_containerized"
base_configuration = module.base_core.configuration
product_version = "uyuni-master"
name = "pxy"
Expand All @@ -224,19 +219,12 @@ module "proxy_containerized" {
username = "admin"
password = "admin"
}
auto_register = false
auto_connect_to_master = false
download_private_ssl_key = false
install_proxy_pattern = false
auto_configure = false
generate_bootstrap_script = false
publish_private_ssl_key = false
use_os_released_updates = true
ssh_key_path = "./salt/controller/id_rsa.pub"

runtime = "podman"
container_repository = "registry.opensuse.org/systemsmanagement/uyuni/master/containers/uyuni"
container_tag = "latest"
auto_configure = false
ssh_key_path = "./salt/controller/id_rsa.pub"
}

// No traditional clients in Uyuni
Expand Down Expand Up @@ -1312,8 +1300,8 @@ module "controller" {
git_repo = var.CUCUMBER_GITREPO
branch = var.CUCUMBER_BRANCH

server_configuration = module.server.configuration
proxy_configuration = module.proxy.configuration
server_configuration = module.server_containerized.configuration
proxy_configuration = module.proxy_containerized.configuration

sle12sp5_minion_configuration = module.sles12sp5-minion.configuration
sle12sp5_sshminion_configuration = module.sles12sp5-sshminion.configuration
Expand Down
25 changes: 6 additions & 19 deletions terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ module "base_s390" {
}

module "server_containerized" {
source = "./modules/server"
source = "./modules/server_containerized"
base_configuration = module.base_core.configuration
product_version = "uyuni-master"
name = "srv"
Expand All @@ -328,29 +328,23 @@ module "server_containerized" {

java_debugging = false
auto_accept = false
monitored = true
disable_firewall = false
allow_postgres_connections = false
skip_changelog_import = false
create_first_user = false
mgr_sync_autologin = false
create_sample_channel = false
create_sample_activation_key = false
create_sample_bootstrap_script = false
publish_private_ssl_key = false
use_os_released_updates = true
disable_download_tokens = false
disable_auto_bootstrap = true
large_deployment = true
ssh_key_path = "./salt/controller/id_rsa.pub"
from_email = "root@suse.de"
accept_all_ssl_protocols = true

runtime = "podman"
container_repository = "registry.opensuse.org/systemsmanagement/uyuni/master/containers/uyuni"
container_tag = "latest"
helm_chart_url = "oci://registry.opensuse.org/systemsmanagement/uyuni/master/charts/uyuni/server"
login_timeout = 28800

//server_additional_repos

Expand All @@ -360,7 +354,7 @@ module "proxy_containerized" {
providers = {
libvirt = libvirt.margarita
}
source = "./modules/proxy"
source = "./modules/proxy_containerized"
base_configuration = module.base_retail.configuration
product_version = "uyuni-master"
name = "pxy"
Expand All @@ -373,19 +367,12 @@ module "proxy_containerized" {
username = "admin"
password = "admin"
}
auto_register = false
auto_connect_to_master = false
download_private_ssl_key = false
install_proxy_pattern = false
auto_configure = false
generate_bootstrap_script = false
publish_private_ssl_key = false
use_os_released_updates = true
ssh_key_path = "./salt/controller/id_rsa.pub"

runtime = "podman"
container_repository = "registry.opensuse.org/systemsmanagement/uyuni/master/containers/uyuni"
container_tag = "latest"
auto_configure = false
ssh_key_path = "./salt/controller/id_rsa.pub"
}

// No traditional clients in Uyuni
Expand Down Expand Up @@ -1608,8 +1595,8 @@ module "controller" {
git_repo = var.CUCUMBER_GITREPO
branch = var.CUCUMBER_BRANCH

server_configuration = module.server.configuration
proxy_configuration = module.proxy.configuration
server_configuration = module.server_containerized.configuration
proxy_configuration = module.proxy_containerized.configuration

sle12sp5_minion_configuration = module.sles12sp5-minion.configuration
sle12sp5_sshminion_configuration = module.sles12sp5-sshminion.configuration
Expand Down
Loading