diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 2c81184..4f4797b 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -23,6 +23,7 @@ rut::infra_ca_rp: sunet::microk8s::node: channel: 1.31/stable + drain_reboot_cron: true sunet::frontend::register_sites: sites: kubeprod.rut.sunet.se: diff --git a/global/overlay/etc/puppet/setup_cosmos_modules b/global/overlay/etc/puppet/setup_cosmos_modules index 963ed2b..475e964 100755 --- a/global/overlay/etc/puppet/setup_cosmos_modules +++ b/global/overlay/etc/puppet/setup_cosmos_modules @@ -125,32 +125,9 @@ def main(): # When/if we want we can do stuff to modules here if host_info: - if host_info["fqdn"] == "internal-sto4-test-monitor-1.rut.sunet.se": - modules["sunet"]["tag"] = "mifr-monitor*" - if host_info["fqdn"] == "internal-sto4-test-k8sw-0.rut.sunet.se": - modules["sunet"]["tag"] = "mifr-monitor*" -# if host_info["fqdn"] == "internal-sto1-test-forgejo-2.platform.sunet.se": -# modules["sunet"]["tag"] = "testing-2*" -# if host_info["fqdn"] == "internal-sto3-test-monitor-1.platform.sunet.se": -# modules["sunet"]["tag"] = "jocar-monitor-handle-legacy-scriptherder-2024-02-14-v10" -# if host_info["fqdn"] == "internal-sto1-test-actrunner-1.platform.sunet.se": -# modules["sunet"]["tag"] = "testing-2*" -## modules["nagioscfg"]["tag"] = "*mifr-2*" -# # modules["stdlib"] = { -# # "tag": "sunet-2*", -# # "upgrade": "yes", -# "repo": "https://github.com/SUNET/puppetlabs-stdlib.git", -# } -# modules["apt"] = { -# "tag": "sunet-2*", -# "upgrade": "yes", -# "repo": "https://github.com/SUNET/puppetlabs-apt.git", -# } -# modules["concat"] = { -# "tag": "sunet-2*", -# "upgrade": "yes", -# "repo": "https://github.com/SUNET/puppetlabs-concat.git", -# } + if host_info["fqdn"] == "internal-sto4-prod-k8sc-1.rut.sunet.se": + modules["sunet"]["tag"] = "drainreboot*" + # if host_info: # if host_info["environment"] == "test": # modules["sunet"]["tag"] = "kano-mail-2*"