Skip to content

Fix some issues deploying Uyuni released #1928

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

Merged
merged 3 commits into from
Oct 8, 2025
Merged

Fix some issues deploying Uyuni released #1928

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
9a9c2d0
Fix deployment issue around DB for 'uyuni-released'
meaksh Oct 7, 2025
8838d60
Fix issue when using avahi on SUSE systems
meaksh Oct 7, 2025
f790c57
Propagate defined 'product_version' properly
meaksh Oct 7, 2025
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
6 changes: 5 additions & 1 deletion modules/build_host/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
locals {
product_version = var.product_version != null ? var.product_version : var.base_configuration["product_version"]
}

module "build_host" {
source = "../host"

Expand All @@ -17,7 +21,7 @@ module "build_host" {
connect_to_additional_network = true
roles = ["build_host"]
disable_firewall = var.disable_firewall
product_version = var.product_version
product_version = local.product_version
grains = {
mirror = var.base_configuration["mirror"]
server = var.server_configuration["hostname"]
Expand Down
12 changes: 8 additions & 4 deletions modules/client/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
locals {
product_version = var.product_version != null ? var.product_version : var.base_configuration["product_version"]
}

module "client" {
source = "../host"

Expand All @@ -17,11 +21,11 @@ module "client" {
connect_to_additional_network = false
roles = ["client"]
disable_firewall = var.disable_firewall
product_version = var.product_version
product_version = local.product_version
grains = {
mirror = var.base_configuration["mirror"]
server = var.server_configuration["hostname"]
auto_register = var.auto_register
mirror = var.base_configuration["mirror"]
server = var.server_configuration["hostname"]
auto_register = var.auto_register
sles_registration_code = var.sles_registration_code
}

Expand Down
7 changes: 6 additions & 1 deletion modules/controller/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ variable "testsuite-branch" {
}
}

locals {
product_version = var.product_version != null ? var.product_version : var.base_configuration["product_version"]
}

module "controller" {
source = "../host"

Expand All @@ -30,7 +34,7 @@ module "controller" {
connect_to_base_network = true
connect_to_additional_network = false
roles = ["controller"]
product_version = var.product_version
product_version = local.product_version
grains = {
cc_username = var.base_configuration["cc_username"]
cc_password = var.base_configuration["cc_password"]
Expand Down Expand Up @@ -64,6 +68,7 @@ module "controller" {
is_using_build_image = var.is_using_build_image
is_using_scc_repositories = var.is_using_scc_repositories
server_instance_id = var.server_instance_id
product_version = local.product_version
container_runtime = lookup(var.server_configuration, "runtime", "")
catch_timeout_message = var.catch_timeout_message
beta_enabled = var.beta_enabled
Expand Down
6 changes: 5 additions & 1 deletion modules/minion/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
locals {
product_version = var.product_version != null ? var.product_version : var.base_configuration["product_version"]
}

module "minion" {
source = "../host"

Expand All @@ -17,7 +21,7 @@ module "minion" {
connect_to_additional_network = false
roles = var.roles
disable_firewall = var.disable_firewall
product_version = var.product_version
product_version = local.product_version
grains = merge({
mirror = var.base_configuration["mirror"]
server = var.auto_connect_to_master ? var.server_configuration["hostname"] : null
Expand Down
2 changes: 1 addition & 1 deletion modules/proxy/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ module "proxy" {
connect_to_additional_network = true
roles = ["proxy"]
disable_firewall = var.disable_firewall
product_version = var.product_version
product_version = local.product_version
grains = {
mirror = var.base_configuration["mirror"]
server = var.server_configuration["hostname"]
Expand Down
1 change: 1 addition & 0 deletions modules/proxy_containerized/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ module "proxy_containerized" {
second_additional_disk_size = var.database_disk_size
volume_provider_settings = var.volume_provider_settings
provision = var.provision
product_version = local.product_version

grains = {
server = var.server_configuration["hostname"]
Expand Down
3 changes: 2 additions & 1 deletion modules/server/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ module "server" {
additional_disk_size = var.repository_disk_size
second_additional_disk_size = var.database_disk_size
volume_provider_settings = var.volume_provider_settings
product_version = var.product_version
product_version = local.product_version
provision = var.provision

grains = {
Expand Down Expand Up @@ -110,5 +110,6 @@ output "configuration" {
hostname = length(module.server.configuration["hostnames"]) > 0 ? module.server.configuration["hostnames"][0] : null
username = var.server_username
password = var.server_password
product_version = local.product_version
}
}
2 changes: 2 additions & 0 deletions modules/server_containerized/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ module "server_containerized" {
additional_disk_size = var.repository_disk_size
second_additional_disk_size = var.database_disk_size
volume_provider_settings = var.volume_provider_settings
product_version = local.product_version

grains = {
container_runtime = var.runtime
Expand Down Expand Up @@ -90,6 +91,7 @@ output "configuration" {
username = var.server_username
password = var.server_password
runtime = var.runtime
product_version = local.product_version
first_user_present = true
}
}
6 changes: 5 additions & 1 deletion modules/sshminion/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
locals {
product_version = var.product_version != null ? var.product_version : var.base_configuration["product_version"]
}

module "sshminion" {
source = "../host"

Expand All @@ -17,7 +21,7 @@ module "sshminion" {
connect_to_additional_network = false
roles = ["sshminion"]
disable_firewall = var.disable_firewall
product_version = var.product_version
product_version = local.product_version
grains = {
mirror = var.base_configuration["mirror"]
sles_registration_code = var.sles_registration_code
Expand Down
6 changes: 5 additions & 1 deletion modules/virthost/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
locals {
product_version = var.product_version != null ? var.product_version : var.base_configuration["product_version"]
}

module "virthost" {
source = "../minion"

base_configuration = var.base_configuration
name = var.name
product_version = var.product_version
product_version = local.product_version
server_configuration = var.server_configuration
activation_key = var.activation_key
auto_connect_to_master = var.auto_connect_to_master
Expand Down
7 changes: 6 additions & 1 deletion salt/default/avahi.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ custom_avahi_repo:
- baseurl: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools:/avahi:/0.6.32/SLE_12_SP5/
{% elif grains['osrelease'] == '15.3' %}
- baseurl: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools:/avahi:/0.7/SLE_15_SP3/
{% elif grains['osrelease'] == '15.4' %}
- baseurl: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools:/avahi:/0.7/SLE_15_SP4/
{% elif grains['osrelease'] == '15.5' %}
- baseurl: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools:/avahi:/0.8/SLE_15_SP5/
{% elif grains['osrelease'] == '15.6' %}
- baseurl: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools:/avahi:/0.8/SLE_15_SP6/
{% endif %}
- enabled: True
- refresh: True
Expand Down Expand Up @@ -42,7 +48,6 @@ avahi_pkg:
- nss-mdns
{% elif grains['os_family'] == 'Suse' %}
- avahi
- avahi-lang
- libavahi-common3
{% if grains['osmajorrelease']|int() == 11 %}
- libavahi-core5
Expand Down
2 changes: 1 addition & 1 deletion salt/server_containerized/large_deployment.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ reload_sshd:
- watch:
- file: large_deployment_increase_sshd_maxstartups

{% if 'uyuni-master' in grains.get('product_version', '') or 'uyuni-pr' in grains.get('product_version', '') or 'head' in grains.get('product_version', '') or '5.1' in grains.get('product_version', '') %}
{% if 'uyuni' in grains.get('product_version', '') or 'head' in grains.get('product_version', '') or '5.1' in grains.get('product_version', '') %}
large_deployment_increase_database_max_connections_db_container:
cmd.run:
- name: podman exec uyuni-db sed -i "s/max_connections = .*/max_connections = 400/" /var/lib/pgsql/data/postgresql.conf
Expand Down
Loading