SUNET/net-ops
10
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Only add legacy sunet forked modules on ubuntu22

Browse source
This commit is contained in:
Patrik Holmqvist 2024-09-24 16:34:02 +02:00
parent 9cc98cea71
commit ca31a0c6c0
Signed by: pahol
GPG key ID: 5D5B0D4E93F77273
1 changed files with 33 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
global/overlay/etc/puppet/setup_cosmos_modules
View file

@ -85,45 +85,44 @@ def main():
"upgrade": "yes", "upgrade": "yes",
"tag": "stable-2023v1-2*", "tag": "stable-2023v1-2*",
}, },
"augeas": {
"repo": "https://github.com/SUNET/puppet-augeas.git",
"upgrade": "yes",
"tag": "sunet-2*",
},
"concat": {
"repo": "https://github.com/SUNET/puppetlabs-concat.git",
"upgrade": "yes",
"tag": "sunet-2*",
},
"stdlib": {
"repo": "https://github.com/SUNET/puppetlabs-stdlib.git",
"upgrade": "yes",
"tag": "sunet-2*",
},
"apt": {
"repo": "https://github.com/SUNET/puppetlabs-apt.git",
"upgrade": "yes",
"tag": "sunet-2*",
},
"docker": {
"repo": "https://github.com/SUNET/garethr-docker.git",
"upgrade": "yes",
"tag": "sunet-2*",
},
} }
if OS_INFO: if OS_INFO:
# Provided by Debian/Ubuntu via
# https://github.com/SUNET/multiverse/blob/main/global/pre-tasks.d/030puppet
if (OS_INFO["ID"] == "debian" and int(OS_INFO["VERSION_ID"]) >= 12) or ( # Exceptions for ubuntu22
OS_INFO["ID"] == "ubuntu" if (OS_INFO["ID"] == "ubuntu"
and debian_support.version_compare(OS_INFO["VERSION_ID"], "24.04") >= 0 and debian_support.version_compare(OS_INFO["VERSION_ID"], "22.04") <= 0
): ):
del modules["augeas"] augeas_module = {
del modules["apt"] "repo": "https://github.com/SUNET/puppet-augeas.git",
del modules["concat"] "upgrade": "yes",
del modules["stdlib"] "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":