From 6decf658b90a7fb18ea3ae57a571a23e9911fe11 Mon Sep 17 00:00:00 2001
From: Maria Haider <mariah@sunet.se>
Date: Wed, 14 Jun 2023 12:25:57 +0200
Subject: [PATCH] update db

---
 global/overlay/etc/puppet/cosmos-db.yaml | 66 +++++++++++-------------
 1 file changed, 31 insertions(+), 35 deletions(-)

diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 4c24b512..ab4b256a 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -76,14 +76,14 @@ classes:
   eidas-connector-1.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: {version: '5:20.10.8~3-0~ubuntu-bionic'}
-    eidas_connector: {hostname: connector.eidas.swedenconnect.se, version: 1.7.0_hsm2_ubuntu}
+    eid::dockerhost: &id003 {version: '5:23.0.6-1~ubuntu.20.04~focal'}
+    eidas_connector: &id004 {hostname: connector.eidas.swedenconnect.se, version: 1.7.0_hsm2_ubuntu}
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
-    sunet::frontend::register_sites:
+    sunet::frontend::register_sites: &id005
       sites:
         connector.eidas.swedenconnect.se:
           frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net]
@@ -94,17 +94,17 @@ classes:
   eidas-connector-1.test.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: &id003 {version: '5:23.0.6-1~ubuntu.20.04~focal'}
-    eidas_connector: &id004 {hostname: test.connector.eidas.swedenconnect.se, luna_debug: true,
+    eid::dockerhost: &id006 {version: '5:23.0.6-1~ubuntu.20.04~focal'}
+    eidas_connector: &id007 {hostname: test.connector.eidas.swedenconnect.se, luna_debug: true,
       version: 1.7.0_hsm2_ubuntu}
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
-    prid_local: &id005 {clients: prid_qa_clients, mdsl: 'https://test.md.eidas.swedenconnect.se/mdservicelist-aggregate.xml',
+    prid_local: &id008 {clients: prid_qa_clients, mdsl: 'https://test.md.eidas.swedenconnect.se/mdservicelist-aggregate.xml',
       version: 1.0.4_ubuntu}
-    sunet::frontend::register_sites: &id006
+    sunet::frontend::register_sites: &id009
       sites:
         test.connector.eidas.swedenconnect.se:
           frontends: [fe-fre-1.test.komreg.net, fe-tug-1.test.komreg.net]
@@ -116,22 +116,34 @@ classes:
   eidas-connector-2.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: &id007 {version: '5:23.0.6-1~ubuntu.20.04~focal'}
-    eidas_connector: &id008 {hostname: connector.eidas.swedenconnect.se, version: 1.7.0_hsm2_ubuntu}
+    eid::dockerhost: *id003
+    eidas_connector: *id004
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
-    sunet::frontend::register_sites: &id009
-      sites:
-        connector.eidas.swedenconnect.se:
-          frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net]
-          port: '443'
+    sunet::frontend::register_sites: *id005
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
   eidas-connector-2.test.sveidas.se:
+    autoupdate: null
+    common: null
+    eid::dockerhost: *id006
+    eidas_connector: *id007
+    entropyclient: null
+    infra_ca_rp: null
+    konsulter: null
+    mailclient: *id001
+    nrpe: null
+    prid_local: *id008
+    sunet::frontend::register_sites: *id009
+    sunet::rsyslog: null
+    sunet::server: *id002
+    sunet_iaas_cloud: null
+    sunetops: null
+  eidas-connector-3.sveidas.se:
     autoupdate: null
     common: null
     eid::dockerhost: *id003
@@ -141,37 +153,21 @@ classes:
     konsulter: null
     mailclient: *id001
     nrpe: null
-    prid_local: *id005
-    sunet::frontend::register_sites: *id006
-    sunet::rsyslog: null
-    sunet::server: *id002
-    sunet_iaas_cloud: null
-    sunetops: null
-  eidas-connector-3.sveidas.se:
-    autoupdate: null
-    common: null
-    eid::dockerhost: *id007
-    eidas_connector: *id008
-    entropyclient: null
-    infra_ca_rp: null
-    konsulter: null
-    mailclient: *id001
-    nrpe: null
-    sunet::frontend::register_sites: *id009
+    sunet::frontend::register_sites: *id005
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
   eidas-connector-4.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: *id007
-    eidas_connector: *id008
+    eid::dockerhost: *id003
+    eidas_connector: *id004
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
-    sunet::frontend::register_sites: *id009
+    sunet::frontend::register_sites: *id005
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
@@ -632,7 +628,7 @@ classes:
           cpus: '8'
           description: eid connector
           gateway: 94.176.224.129
-          image_url: https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img
+          image_url: https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
           ip: 94.176.224.133
           mac: '52:54:20:01:04:01'
           memory: '8192'