Cleanup setup_cosmos_module
Include less puppet module repos by default and use testing tag on puppet-sunet for test machines.
This commit is contained in:
parent
3cce04bc7a
commit
cbb8c25345
|
@ -77,6 +77,16 @@ def main():
|
||||||
modulesfile_tmp: str = modulesfile + ".tmp"
|
modulesfile_tmp: str = modulesfile + ".tmp"
|
||||||
|
|
||||||
modules: dict = {
|
modules: dict = {
|
||||||
|
"sunet": {
|
||||||
|
"repo": "https://github.com/SUNET/puppet-sunet.git",
|
||||||
|
"upgrade": "yes",
|
||||||
|
"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",
|
||||||
|
@ -87,107 +97,28 @@ def main():
|
||||||
"upgrade": "yes",
|
"upgrade": "yes",
|
||||||
"tag": "sunet-2*",
|
"tag": "sunet-2*",
|
||||||
},
|
},
|
||||||
"cosmos": {
|
|
||||||
"repo": "https://github.com/SUNET/puppet-cosmos.git",
|
|
||||||
"upgrade": "yes",
|
|
||||||
"tag": "sunet-2*",
|
|
||||||
},
|
|
||||||
"ufw": {
|
|
||||||
"repo": "https://github.com/SUNET/puppet-module-ufw.git",
|
|
||||||
"upgrade": "yes",
|
|
||||||
"tag": "sunet-2*",
|
|
||||||
},
|
|
||||||
"apt": {
|
"apt": {
|
||||||
"repo": "https://github.com/SUNET/puppetlabs-apt.git",
|
"repo": "https://github.com/SUNET/puppetlabs-apt.git",
|
||||||
"upgrade": "yes",
|
"upgrade": "yes",
|
||||||
"tag": "sunet-2*",
|
"tag": "sunet-2*",
|
||||||
},
|
},
|
||||||
"vcsrepo": {
|
|
||||||
"repo": "https://github.com/SUNET/puppetlabs-vcsrepo.git",
|
|
||||||
"upgrade": "yes",
|
|
||||||
"tag": "sunet-2*",
|
|
||||||
},
|
|
||||||
"xinetd": {
|
|
||||||
"repo": "https://github.com/SUNET/puppetlabs-xinetd.git",
|
|
||||||
"upgrade": "yes",
|
|
||||||
"tag": "sunet-2*",
|
|
||||||
},
|
|
||||||
"python": {
|
|
||||||
"repo": "https://github.com/SUNET/puppet-python.git",
|
|
||||||
"upgrade": "yes",
|
|
||||||
"tag": "sunet-2*",
|
|
||||||
},
|
|
||||||
"hiera-gpg": {
|
|
||||||
"repo": "https://github.com/SUNET/hiera-gpg.git",
|
|
||||||
"upgrade": "yes",
|
|
||||||
"tag": "sunet-2*",
|
|
||||||
},
|
|
||||||
"pound": {
|
|
||||||
"repo": "https://github.com/SUNET/puppet-pound.git",
|
|
||||||
"upgrade": "yes",
|
|
||||||
"tag": "sunet-2*",
|
|
||||||
},
|
|
||||||
"augeas": {
|
|
||||||
"repo": "https://github.com/SUNET/puppet-augeas.git",
|
|
||||||
"upgrade": "yes",
|
|
||||||
"tag": "sunet-2*",
|
|
||||||
},
|
|
||||||
"bastion": {
|
|
||||||
"repo": "https://github.com/SUNET/puppet-bastion.git",
|
|
||||||
"upgrade": "yes",
|
|
||||||
"tag": "sunet-2*",
|
|
||||||
},
|
|
||||||
"pyff": {
|
|
||||||
"repo": "https://github.com/samlbits/puppet-pyff.git",
|
|
||||||
"upgrade": "yes",
|
|
||||||
"tag": "puppet-pyff-*",
|
|
||||||
},
|
|
||||||
"dhcp": {
|
|
||||||
"repo": "https://github.com/SUNET/puppetlabs-dhcp.git",
|
|
||||||
"upgrade": "yes",
|
|
||||||
"tag": "sunet_dev-2*",
|
|
||||||
},
|
|
||||||
"varnish": {
|
|
||||||
"repo": "https://github.com/samlbits/puppet-varnish.git",
|
|
||||||
"upgrade": "yes",
|
|
||||||
"tag": "puppet-varnish-*",
|
|
||||||
},
|
|
||||||
"apparmor": {
|
|
||||||
"repo": "https://github.com/SUNET/puppet-apparmor.git",
|
|
||||||
"upgrade": "yes",
|
|
||||||
"tag": "sunet-2*",
|
|
||||||
},
|
|
||||||
"docker": {
|
"docker": {
|
||||||
"repo": "https://github.com/SUNET/garethr-docker.git",
|
"repo": "https://github.com/SUNET/garethr-docker.git",
|
||||||
"upgrade": "yes",
|
"upgrade": "yes",
|
||||||
"tag": "sunet-2*",
|
"tag": "sunet-2*",
|
||||||
},
|
},
|
||||||
"network": {
|
|
||||||
"repo": "https://github.com/SUNET/attachmentgenie-network.git",
|
|
||||||
"upgrade": "yes",
|
|
||||||
"tag": "sunet-2*",
|
|
||||||
},
|
|
||||||
"sunet": {
|
|
||||||
"repo": "https://github.com/SUNET/puppet-sunet.git",
|
|
||||||
"upgrade": "yes",
|
|
||||||
"tag": "sunet-2*",
|
|
||||||
},
|
|
||||||
"sysctl": {
|
|
||||||
"repo": "https://github.com/SUNET/puppet-sysctl.git",
|
|
||||||
"upgrade": "yes",
|
|
||||||
"tag": "sunet-2*",
|
|
||||||
},
|
|
||||||
"nagioscfg": {
|
|
||||||
"repo": "https://github.com/SUNET/puppet-nagioscfg.git",
|
|
||||||
"upgrade": "yes",
|
|
||||||
"tag": "sunet-2*",
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# When/if we want we can do stuff to modules here
|
# Make test machines use special test branch of puppet-sunet:
|
||||||
if OS_INFO:
|
if OS_INFO:
|
||||||
if OS_INFO["VERSION_CODENAME"] == "bullseye":
|
if OS_INFO["ID"] == "ubuntu":
|
||||||
pass
|
import platform
|
||||||
|
|
||||||
|
nodename = platform.node()
|
||||||
|
name_parts = nodename.split("-")
|
||||||
|
if len(name_parts) > 1:
|
||||||
|
if name_parts[1] == "test":
|
||||||
|
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)
|
||||||
|
|
Loading…
Reference in a new issue