From ee8416f284068480cd5c5de7bcf16a24745da4c7 Mon Sep 17 00:00:00 2001
From: Maria Haider <mariah@sunet.se>
Date: Fri, 8 Sep 2023 11:18:28 +0200
Subject: [PATCH] Bygger om sunetops

Ref: SC-1773
---
 global/overlay/etc/puppet/cosmos-rules.yaml | 64 ++++++++++++++++++++-
 1 file changed, 63 insertions(+), 1 deletion(-)

diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 68588998..dae30916 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -1,6 +1,5 @@
 '.+':
    common:
-   sunetops:
    nrpe:
    entropyclient:
    infra_ca_rp:
@@ -13,6 +12,7 @@
 
 jmp.komreg.net:
    konsulter:
+   sunetops:
    metadatamgrs:
    sunet_iaas_cloud:
    autoupdate:
@@ -23,6 +23,7 @@ jmp.komreg.net:
 
 '^jump-.+\.komreg\.net$':
    konsulter:
+   sunetops:
    metadatamgrs:
    autoupdate:
    jumphosts:
@@ -30,6 +31,7 @@ jmp.komreg.net:
       ssh_allow_from_anywhere: true
 
 kvmfe-tug-3.komreg.net:
+   sunetops:
    eid::kvmhost:
       vms:
          fe-tug-3.komreg.net:
@@ -58,6 +60,7 @@ kvmfe-tug-3.komreg.net:
             image_url: 'https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img'
 
 kvminfra-tug-3.komreg.net:
+   sunetops:
    eid::kvmhost:
       vms:
          log-2.sveidas.se:
@@ -93,6 +96,7 @@ kvminfra-tug-3.komreg.net:
             image_url: 'https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img'
 
 kvmmeta-tug-3.komreg.net:
+   sunetops:
    eid::kvmhost:
       vms:
          natmd-2.komreg.net:
@@ -137,6 +141,7 @@ kvmmeta-tug-3.komreg.net:
             image_url: 'https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img'
 
 kvmeidas-tug-3.komreg.net:
+   sunetops:
    eid::kvmhost:
       vms:
          eidas-connector-2.sveidas.se:
@@ -207,6 +212,7 @@ kvmeidas-tug-3.komreg.net:
             image_url: 'https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img'
 
 kvmfe-fre-3.komreg.net:
+   sunetops:
    eid::kvmhost:
       vms:
          fe-fre-3.komreg.net:
@@ -235,6 +241,7 @@ kvmfe-fre-3.komreg.net:
             image_url: 'https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img'
 
 kvminfra-fre-3.komreg.net:
+   sunetops:
    eid::kvmhost:
       vms:
          monitor-fre-3.komreg.net:
@@ -270,6 +277,7 @@ kvminfra-fre-3.komreg.net:
             image_url: 'https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img'
 
 kvmmeta-fre-3.komreg.net:
+   sunetops:
    eid::kvmhost:
       vms:
          natmd-1.komreg.net:
@@ -314,6 +322,7 @@ kvmmeta-fre-3.komreg.net:
             image_url: 'https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img'
 
 kvmeidas-fre-3.komreg.net:
+   sunetops:
    eid::kvmhost:
       vms:
          eidas-connector-1.sveidas.se:
@@ -384,6 +393,7 @@ kvmeidas-fre-3.komreg.net:
             image_url: 'https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img'
 
 kvmdemw-fre-3a.komreg.net:
+   sunetops:
    eid::kvmhost:
       vms:
          demw-1.sveidas.se:
@@ -399,6 +409,7 @@ kvmdemw-fre-3a.komreg.net:
             image_url: 'https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img'
 
 kvmdemw-fre-3b.komreg.net:
+   sunetops:
    eid::kvmhost:
       vms:
          demw-2.sveidas.se:
@@ -413,20 +424,24 @@ kvmdemw-fre-3b.komreg.net:
             image_url: 'https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img'
 
 monitor-fre-3.komreg.net:
+   sunetops:
    autoupdate:
    eid::nagios_monitor:
 
 monitor-tug-3.komreg.net:
+   sunetops:
    autoupdate:
    eid::nagios_monitor:
 
 country-test-1.test.komreg.net:
+   sunetops:
    autoupdate:
    eid::dockerhost:
       version: '5:24.0.5-1~ubuntu.20.04~focal'
       storage_driver: 'overlay2'
 
 natmd-1.komreg.net:
+   sunetops:
    autoupdate:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
@@ -440,6 +455,7 @@ natmd-1.komreg.net:
    md_repo_client:
 
 natmd-test-1.komreg.net:
+   sunetops:
    autoupdate:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
@@ -463,6 +479,7 @@ natmd-test-1.komreg.net:
       signed_repo: true
 
 eumd-1.komreg.net:
+   sunetops:
    autoupdate:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
@@ -476,6 +493,7 @@ eumd-1.komreg.net:
    md_repo_client:
 
 eumd-test-1.komreg.net:
+   sunetops:
    autoupdate:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
@@ -489,6 +507,7 @@ eumd-test-1.komreg.net:
       version: 1.1.5-eidas
 
 natpub-1.komreg.net:
+   sunetops:
    autoupdate:
    md_publisher:
      keyname: natpub-1.komreg.net_infra
@@ -502,6 +521,7 @@ natpub-1.komreg.net:
          port: '443'
 
 natpub-test-1.komreg.net:
+   sunetops:
    autoupdate:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
@@ -517,6 +537,7 @@ natpub-test-1.komreg.net:
          port: '443'
 
 eupub-1.komreg.net:
+   sunetops:
    autoupdate:
    md_publisher:
      keyname: eupub-1.komreg.net_infra
@@ -531,6 +552,7 @@ eupub-1.komreg.net:
          port: '443'
 
 eupub-test-1.komreg.net:
+   sunetops:
    autoupdate:
    md_publisher:
      keyname: eupub-test-1.komreg.net_infra
@@ -545,6 +567,7 @@ eupub-test-1.komreg.net:
          port: '443'
 
 natmd-2.komreg.net:
+   sunetops:
    autoupdate:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
@@ -558,6 +581,7 @@ natmd-2.komreg.net:
    md_repo_client:
 
 natmd-test-2.komreg.net:
+   sunetops:
    autoupdate:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
@@ -571,6 +595,7 @@ natmd-test-2.komreg.net:
    md_repo_client:
 
 eumd-2.komreg.net:
+   sunetops:
    autoupdate:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
@@ -584,6 +609,7 @@ eumd-2.komreg.net:
    md_repo_client:
 
 eumd-test-2.komreg.net:
+   sunetops:
    autoupdate:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
@@ -597,6 +623,7 @@ eumd-test-2.komreg.net:
       version: 1.1.5-eidas
 
 natpub-2.komreg.net:
+   sunetops:
    autoupdate:
    md_publisher:
      keyname: natpub-2.komreg.net_infra
@@ -610,6 +637,7 @@ natpub-2.komreg.net:
          port: '443'
 
 natpub-test-2.komreg.net:
+   sunetops:
    autoupdate:
    metadatamgrs:
    md_publisher:
@@ -624,6 +652,7 @@ natpub-test-2.komreg.net:
          port: '443'
 
 eupub-2.komreg.net:
+   sunetops:
    autoupdate:
    md_publisher:
      keyname: eupub-2.komreg.net_infra
@@ -638,6 +667,7 @@ eupub-2.komreg.net:
          port: '443'
 
 eupub-test-2.komreg.net:
+   sunetops:
    autoupdate:
    md_publisher:
      keyname: eupub-test-2.komreg.net_infra
@@ -652,6 +682,7 @@ eupub-test-2.komreg.net:
          port: '443'
 
 nic.komreg.net:
+   sunetops:
    sunet_iaas_cloud:
    autoupdate:
    konsulter:
@@ -660,6 +691,7 @@ nic.komreg.net:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
 
 r1.komreg.net:
+   sunetops:
    sunet_iaas_cloud:
    autoupdate:
    eid::dockerhost:
@@ -668,6 +700,7 @@ r1.komreg.net:
       hostname: r1.komreg.net
 
 p1.komreg.net:
+   sunetops:
    sunet_iaas_cloud:
    autoupdate:
    md_publisher:
@@ -682,6 +715,7 @@ p1.komreg.net:
          port: '443'
 
 p2.qa.komreg.net:
+   sunetops:
    sunet_iaas_cloud:
    autoupdate:
    md_publisher:
@@ -697,6 +731,7 @@ p2.qa.komreg.net:
          port: '443'
 
 md1.komreg.net:
+   sunetops:
    sunet_iaas_cloud:
    autoupdate:
    eid::dockerhost:
@@ -711,6 +746,7 @@ md1.komreg.net:
    md_repo_client:
 
 md-eu1.qa.komreg.net:
+   sunetops:
    sunet_iaas_cloud:
    autoupdate:
    metadatamgrs:
@@ -725,6 +761,7 @@ md-eu1.qa.komreg.net:
    md_repo_client:
 
 '^test-[0-9]+\.qa\.sveidas\.se$':
+   sunetops:
    sunet_iaas_cloud:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
@@ -742,6 +779,7 @@ md-eu1.qa.komreg.net:
          port: '443'
 
 test-1.test.sveidas.se:
+   sunetops:
    sunet_iaas_cloud:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
@@ -760,6 +798,7 @@ test-1.test.sveidas.se:
          port: '443'
 
 '^demw-[0-9]+\.qa\.sveidas\.se$':
+   sunetops:
    sunet_iaas_cloud:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
@@ -782,6 +821,7 @@ test-1.test.sveidas.se:
          port: '443'
 
 demw-1.sveidas.se:
+   sunetops:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
       docker_repo: stable
@@ -804,6 +844,7 @@ demw-1.sveidas.se:
          port: '443'
 
 demw-2.sveidas.se:
+   sunetops:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
       docker_repo: stable
@@ -819,6 +860,7 @@ demw-2.sveidas.se:
       enabled: false
 
 '^refidp-[0-9]+\.qa\.sveidas\.se$':
+   sunetops:
    sunet_iaas_cloud:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
@@ -837,6 +879,7 @@ demw-2.sveidas.se:
          port: '443'
 
 '^refidp-[0-9]+\.test\.sveidas\.se$':
+   sunetops:
    sunet_iaas_cloud:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
@@ -855,6 +898,7 @@ demw-2.sveidas.se:
          port: '443'
 
 '^eidas-test-[0-9]+\.sveidas\.se$':
+   sunetops:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
    konsulter:
@@ -872,6 +916,7 @@ demw-2.sveidas.se:
          port: '443'
 
 '^eidas-connector-[0-9]+\.sveidas\.se$':
+   sunetops:
    eid::dockerhost:
      version: '5:23.0.6-1~ubuntu.20.04~focal'
      docker_repo: stable
@@ -889,6 +934,7 @@ demw-2.sveidas.se:
          port: '443'
 
 '^prid-[0-9]+\.sveidas\.se$':
+   sunetops:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
       docker_repo: stable
@@ -901,6 +947,7 @@ demw-2.sveidas.se:
       mdsl: https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml
 
 '^validator-[0-9]+\.komreg\.net$':
+   sunetops:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
    konsulter:
@@ -916,6 +963,7 @@ demw-2.sveidas.se:
          port: '443'
 
 validator-test-1.komreg.net:
+   sunetops:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
    konsulter:
@@ -931,6 +979,7 @@ validator-test-1.komreg.net:
          port: '443'
 
 '^eidas-proxy-[0-9]+\.sveidas\.se$':
+   sunetops:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
    konsulter:
@@ -949,6 +998,7 @@ validator-test-1.komreg.net:
          port: '443'
 
 log-2.sveidas.se:
+   sunetops:
    autoupdate:
    konsulter:
    eidas_log:
@@ -959,6 +1009,7 @@ log-2.sveidas.se:
       udp_port: 514
       udp_client: 94.176.224.0/24
 log-1.sveidas.se:
+   sunetops:
    autoupdate:
    konsulter:
    eid::dockerhost:
@@ -970,6 +1021,7 @@ log-1.sveidas.se:
       udp_client: 94.176.224.0/24
 
 '^eidas-node-[0-9]+\.qa\.sveidas\.se$':
+   sunetops:
    konsulter:
    sunet_iaas_cloud:
    autoupdate:
@@ -987,6 +1039,7 @@ log-1.sveidas.se:
          port: '443'
 
 '^eidas-connector-[0-9]+\.test\.sveidas\.se$':
+   sunetops:
    sunet_iaas_cloud:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
@@ -1009,6 +1062,7 @@ log-1.sveidas.se:
          port: '443'
 
 '^eidas-proxy-[0-9]+\.qa\.sveidas\.se$':
+   sunetops:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
    konsulter:
@@ -1029,6 +1083,7 @@ log-1.sveidas.se:
          port: '443'
 
 '^eidas-proxy-[0-9]+\.test\.sveidas\.se$':
+   sunetops:
    sunet_iaas_cloud:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
@@ -1049,6 +1104,7 @@ log-1.sveidas.se:
          port: '443'
 
 '^prid-[0-9]+\.qa\.sveidas\.se$':
+   sunetops:
    konsulter:
    sunet_iaas_cloud:
    autoupdate:
@@ -1061,6 +1117,7 @@ log-1.sveidas.se:
       mdsl: https://qa.md.eidas.swedenconnect.se/mdservicelist-aggregate.xml
 
 '^fe-.+-\d+\.komreg\.net$':
+   sunetops:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
       docker_repo: stable
@@ -1068,12 +1125,14 @@ log-1.sveidas.se:
    fe_servers:
 
 '^fe-.+-\d+\.test\.komreg\.net$':
+   sunetops:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
    sunet::frontend::load_balancer:
    fe_servers:
 
 log.qa.sveidas.se:
+   sunetops:
    sunet_iaas_cloud:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
@@ -1088,6 +1147,7 @@ log.qa.sveidas.se:
       udp_port: 514
 
 log-1.test.sveidas.se:
+   sunetops:
    autoupdate:
    sunet_iaas_cloud:
    eid::dockerhost:
@@ -1098,6 +1158,7 @@ log-1.test.sveidas.se:
       udp_port: 514
 
 eidastest-1.qa.sveidas.se:
+   sunetops:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
    sunet_iaas_cloud:
@@ -1117,6 +1178,7 @@ eidastest-1.qa.sveidas.se:
          port: '443'
 
 '^relay-[0-9]+\.swedenconnect\.se$':
+   sunetops:
    sunet_iaas_cloud:
    autoupdate:
    eid::relay: