Remove ubuntu22 exceptions, try manual module install
This commit is contained in:
parent
1fe0f00869
commit
407e1fc280
|
@ -89,41 +89,6 @@ def main():
|
||||||
|
|
||||||
if OS_INFO:
|
if OS_INFO:
|
||||||
|
|
||||||
# Exceptions for ubuntu22
|
|
||||||
if (OS_INFO["ID"] == "ubuntu"
|
|
||||||
and debian_support.version_compare(OS_INFO["VERSION_ID"], "22.04") <= 0
|
|
||||||
):
|
|
||||||
augeas_module = {
|
|
||||||
"repo": "https://github.com/SUNET/puppet-augeas.git",
|
|
||||||
"upgrade": "yes",
|
|
||||||
"tag": "sunet-2*",
|
|
||||||
}
|
|
||||||
modules.update(augeas_module)
|
|
||||||
apt_module = {
|
|
||||||
"repo": "https://github.com/SUNET/puppetlabs-apt.git",
|
|
||||||
"upgrade": "yes",
|
|
||||||
"tag": "sunet-2*",
|
|
||||||
}
|
|
||||||
modules.update(apt_module)
|
|
||||||
concat_module = {
|
|
||||||
"repo": "https://github.com/SUNET/puppetlabs-concat.git",
|
|
||||||
"upgrade": "yes",
|
|
||||||
"tag": "sunet-2*",
|
|
||||||
}
|
|
||||||
modules.update(concat_module)
|
|
||||||
stdlib_module = {
|
|
||||||
"repo": "https://github.com/SUNET/puppetlabs-stdlib.git",
|
|
||||||
"upgrade": "yes",
|
|
||||||
"tag": "sunet-2*",
|
|
||||||
}
|
|
||||||
modules.update(stdlib_module)
|
|
||||||
vcsrepo_module = {
|
|
||||||
"repo": "https://github.com/SUNET/puppetlabs-vcsrepo.git",
|
|
||||||
"upgrade": "yes",
|
|
||||||
"tag": "sunet-2*",
|
|
||||||
}
|
|
||||||
modules.update(vcsrepo_module)
|
|
||||||
|
|
||||||
# Make test machines use special test branch of puppet-sunet:
|
# Make test machines use special test branch of puppet-sunet:
|
||||||
if OS_INFO["ID"] == "ubuntu":
|
if OS_INFO["ID"] == "ubuntu":
|
||||||
nodename = platform.node()
|
nodename = platform.node()
|
||||||
|
|
Loading…
Reference in a new issue