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: Add workaround for Deblike minions #1000

Merged
merged 3 commits into from
Oct 20, 2023
Merged

Uyuni BV: Add workaround for Deblike minions #1000

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
981aee0
Remove Debian 9 comment from Uyuni BV
nodeg Oct 20, 2023
a1483de
Add workaround for Deblike minions in Uyuni BV
nodeg Oct 20, 2023
d95f02a
Do not use the workaround on Debian 11
nodeg Oct 20, 2023
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
28 changes: 24 additions & 4 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 @@ -459,6 +459,10 @@ module "ubuntu2004-minion" {
auto_connect_to_master = false
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"

# WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}

module "ubuntu2204-minion" {
Expand All @@ -479,8 +483,6 @@ module "ubuntu2204-minion" {
ssh_key_path = "./salt/controller/id_rsa.pub"
}

// Debian 9 is not supported by 4.3
Copy link
Contributor

@Bischoff Bischoff Oct 20, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... or you change it to:

// Debian 9 is not supported by Uyuni


module "debian10-minion" {
source = "./modules/minion"
base_configuration = module.base_core.configuration
Expand All @@ -498,6 +500,10 @@ module "debian10-minion" {
auto_connect_to_master = false
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"

# WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}

module "debian11-minion" {
Expand All @@ -517,6 +523,10 @@ module "debian11-minion" {
auto_connect_to_master = false
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"

nodeg marked this conversation as resolved.
Show resolved Hide resolved
# WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}

module "debian12-minion" {
Expand Down Expand Up @@ -865,6 +875,10 @@ module "ubuntu2004-sshminion" {
}
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"

# WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}

module "ubuntu2204-sshminion" {
Expand All @@ -881,8 +895,6 @@ module "ubuntu2204-sshminion" {
ssh_key_path = "./salt/controller/id_rsa.pub"
}

// Debian 9 is not supported by 4.3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... or you change it to:

// Debian 9 is not supported by Uyuni


module "debian10-sshminion" {
source = "./modules/sshminion"
base_configuration = module.base_core.configuration
Expand All @@ -895,6 +907,10 @@ module "debian10-sshminion" {
}
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"

# WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}

module "debian11-sshminion" {
Expand All @@ -909,6 +925,10 @@ module "debian11-sshminion" {
}
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"

nodeg marked this conversation as resolved.
Show resolved Hide resolved
# WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}

module "debian12-sshminion" {
Expand Down
24 changes: 24 additions & 0 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 @@ -646,6 +646,10 @@ module "ubuntu2004-minion" {
auto_connect_to_master = false
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"

# WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}

module "ubuntu2204-minion" {
Expand Down Expand Up @@ -691,6 +695,10 @@ module "debian10-minion" {
auto_connect_to_master = false
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"

# WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}

module "debian11-minion" {
Expand All @@ -713,6 +721,10 @@ module "debian11-minion" {
auto_connect_to_master = false
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"

nodeg marked this conversation as resolved.
Show resolved Hide resolved
# WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}

module "debian12-minion" {
Expand Down Expand Up @@ -1113,6 +1125,10 @@ module "ubuntu2004-sshminion" {
}
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"

# WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}

module "ubuntu2204-sshminion" {
Expand Down Expand Up @@ -1149,6 +1165,10 @@ module "debian10-sshminion" {
}
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"

# WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}

module "debian11-sshminion" {
Expand All @@ -1166,6 +1186,10 @@ module "debian11-sshminion" {
}
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"

nodeg marked this conversation as resolved.
Show resolved Hide resolved
# WORKAROUND https://github.com/uyuni-project/uyuni/issues/7637
additional_packages = [ "venv-salt-minion" ]
install_salt_bundle = true
}

module "debian12-sshminion" {
Expand Down
Loading