sunet-cdn/cdn-ops
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix problems with outdated sunet puppet modules

Browse source 
Problem seen:
```
Error: Evaluation Error: Error while evaluating a Resource Statement, Evaluation Error: Unknown variable: '::osfamily'. (file: /etc/puppet/cosmos-modules/augeas/manifests/params.pp, line: 7, column: 8) on node example-1.sunet.se
```

This way we run modules installed from upstream apt packages instead.
Solution to delete keys to use local pacakges from pahol.

While here fix pylint issue with not importing platform module at
beginning of file.
This commit is contained in:
Patrik Lundin 2024-07-04 14:42:34 +02:00
parent 3d0413b450
commit 94a65a31e0
Signed by: patlu
GPG key ID: A0A812BA2249F294
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,8 +4,11 @@
import hashlib
import os
import os.path
import platform
import sys
from debian import debian_support
try:
from configobj import ConfigObj
@ -109,11 +112,21 @@ def main():
},
}
# Make test machines use special test branch of puppet-sunet:
if OS_INFO:
if OS_INFO["ID"] == "ubuntu":
import platform
# 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 (
OS_INFO["ID"] == "ubuntu"
and debian_support.version_compare(OS_INFO["VERSION_ID"], "24.04") >= 0
):
del modules["augeas"]
del modules["apt"]
del modules["concat"]
del modules["stdlib"]
# Make test machines use special test branch of puppet-sunet:
if OS_INFO["ID"] == "ubuntu":
nodename = platform.node()
name_parts = nodename.split("-")
if len(name_parts) > 1: