verglasz/soc-ops
0
0
Fork 0
forked from SUNET/soc-ops
Code Pull requests Activity

fixing with modules

Browse source
This commit is contained in:
Johan Björklund 2024-10-28 15:35:05 +01:00
parent 25bb16852c
commit 03694c1384
Signed by untrusted user: bjorklund
GPG key ID: 5E8401339C7F5037
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -85,6 +85,11 @@ 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": { "concat": {
"repo": "https://github.com/SUNET/puppetlabs-concat.git", "repo": "https://github.com/SUNET/puppetlabs-concat.git",
"upgrade": "yes", "upgrade": "yes",
@ -115,17 +120,18 @@ def main():
OS_INFO["ID"] == "ubuntu" 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"], "24.04") >= 0
): ):
del modules["augeas"]
del modules["apt"] del modules["apt"]
del modules["concat"] del modules["concat"]
del modules["stdlib"] del modules["stdlib"]
# 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()
name_parts = nodename.split("-") # name_parts = nodename.split("-")
if len(name_parts) > 1: # if len(name_parts) > 1:
if name_parts[1] == "test": # if name_parts[1] == "test":
modules["sunet"]["tag"] = "testing-2*" # modules["sunet"]["tag"] = "testing-2*"
# Build list of expected file content # Build list of expected file content
file_lines = create_file_content(modules) file_lines = create_file_content(modules)