From 7fee495950f2d45598a6090ea263ff5f18905508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Bergstro=CC=88m?= <berra@nordu.net>
Date: Thu, 23 Aug 2018 14:42:00 +0200
Subject: [PATCH] update db

---
 global/overlay/etc/puppet/cosmos-db.yaml | 86 +++---------------------
 1 file changed, 10 insertions(+), 76 deletions(-)

diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 215039de..e83c90cc 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -14,7 +14,6 @@ classes:
         connector.eidas.swedenconnect.se:
           frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net]
           port: '443'
-    sunet::ntp: &id004 {disable_pool_ntp_org: false}
     sunet::rsyslog: null
     sunetops: null
   eidas-connector-2.sveidas.se:
@@ -28,7 +27,6 @@ classes:
     mailclient: *id002
     nrpe: null
     sunet::frontend::register_sites: *id003
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   eidas-connector-3.sveidas.se:
@@ -42,7 +40,6 @@ classes:
     mailclient: *id002
     nrpe: null
     sunet::frontend::register_sites: *id003
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   eidas-connector-4.sveidas.se:
@@ -56,7 +53,6 @@ classes:
     mailclient: *id002
     nrpe: null
     sunet::frontend::register_sites: *id003
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   eidas-node-1.qa.sveidas.se:
@@ -74,7 +70,6 @@ classes:
         qa.connector.eidas.swedenconnect.se:
           frontends: [se-fre-lb-1.sunet.se, se-tug-lb-1.sunet.se]
           port: '443'
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunet_iaas_cloud: null
     sunetops: null
@@ -94,7 +89,6 @@ classes:
         qa.proxy.eidas.swedenconnect.se:
           frontends: [se-fre-lb-1.sunet.se, se-tug-lb-1.sunet.se]
           port: '443'
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunet_iaas_cloud: null
     sunetops: null
@@ -107,7 +101,6 @@ classes:
     mailclient: *id002
     nrpe: null
     redis_cluster_node: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   eidas-redis-2.sveidas.se:
@@ -119,7 +112,6 @@ classes:
     mailclient: *id002
     nrpe: null
     redis_cluster_node: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   eidas-redis-3.sveidas.se:
@@ -131,7 +123,6 @@ classes:
     mailclient: *id002
     nrpe: null
     redis_cluster_node: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   eidas-redis-4.sveidas.se:
@@ -143,7 +134,6 @@ classes:
     mailclient: *id002
     nrpe: null
     redis_cluster_node: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   eidas-redis-fe-1.sveidas.se:
@@ -154,8 +144,7 @@ classes:
     infra_ca_rp: null
     mailclient: *id002
     nrpe: null
-    redis_frontend_node: &id005 {hostname: redis.sveidas.se}
-    sunet::ntp: *id004
+    redis_frontend_node: &id004 {hostname: redis.sveidas.se}
     sunet::rsyslog: null
     sunetops: null
   eidas-redis-fe-2.sveidas.se:
@@ -166,42 +155,39 @@ classes:
     infra_ca_rp: null
     mailclient: *id002
     nrpe: null
-    redis_frontend_node: *id005
-    sunet::ntp: *id004
+    redis_frontend_node: *id004
     sunet::rsyslog: null
     sunetops: null
   eidas-test-1.sveidas.se:
     autoupdate: null
     common: null
     eid::dockerhost: null
-    eidas_sp: &id006 {hostname: test.swedenconnect.se, version: 1.0.0}
+    eidas_sp: &id005 {hostname: test.swedenconnect.se, version: 1.0.0}
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id002
     nrpe: null
     servicemonitor: null
-    sunet::frontend::register_sites: &id007
+    sunet::frontend::register_sites: &id006
       sites:
         test.swedenconnect.se:
           frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net]
           port: '443'
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   eidas-test-2.sveidas.se:
     autoupdate: null
     common: null
     eid::dockerhost: null
-    eidas_sp: *id006
+    eidas_sp: *id005
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id002
     nrpe: null
     servicemonitor: null
-    sunet::frontend::register_sites: *id007
-    sunet::ntp: *id004
+    sunet::frontend::register_sites: *id006
     sunet::rsyslog: null
     sunetops: null
   eumd-1.komreg.net:
@@ -217,7 +203,6 @@ classes:
     md_signer: {dest_host: eupub-1.komreg.net, name: eidas-prod}
     metadatamgrs: null
     nrpe: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   eumd-2.komreg.net:
@@ -233,7 +218,6 @@ classes:
     md_signer: {dest_host: eupub-2.komreg.net, name: eidas-prod}
     metadatamgrs: null
     nrpe: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   eupub-1.komreg.net:
@@ -249,7 +233,6 @@ classes:
         md.eidas.swedenconnect.se:
           frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net]
           port: '443'
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   eupub-2.komreg.net:
@@ -265,7 +248,6 @@ classes:
         md.eidas.swedenconnect.se:
           frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net]
           port: '443'
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   fe-fre-3.komreg.net:
@@ -276,7 +258,6 @@ classes:
     mailclient: *id002
     nrpe: null
     sunet::frontend::load_balancer: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   fe-tug-3.komreg.net:
@@ -287,7 +268,6 @@ classes:
     mailclient: *id002
     nrpe: null
     sunet::frontend::load_balancer: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   jmp.komreg.net:
@@ -301,7 +281,6 @@ classes:
     metadatamgrs: null
     nrpe: null
     sunet::auditd: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunet_iaas_cloud: null
     sunetops: null
@@ -315,7 +294,6 @@ classes:
     mailclient: *id002
     metadatamgrs: null
     nrpe: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   jump-tug-3.komreg.net:
@@ -328,7 +306,6 @@ classes:
     mailclient: *id002
     metadatamgrs: null
     nrpe: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   kvmeidas-fre-3.komreg.net:
@@ -409,7 +386,6 @@ classes:
     infra_ca_rp: null
     mailclient: *id002
     nrpe: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   kvmeidas-tug-3.komreg.net:
@@ -490,7 +466,6 @@ classes:
     infra_ca_rp: null
     mailclient: *id002
     nrpe: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   kvmfe-fre-3.komreg.net:
@@ -504,7 +479,6 @@ classes:
     infra_ca_rp: null
     mailclient: *id002
     nrpe: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   kvmfe-tug-3.komreg.net:
@@ -518,7 +492,6 @@ classes:
     infra_ca_rp: null
     mailclient: *id002
     nrpe: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   kvminfra-fre-3.komreg.net:
@@ -542,7 +515,6 @@ classes:
     infra_ca_rp: null
     mailclient: *id002
     nrpe: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   kvminfra-tug-3.komreg.net:
@@ -563,7 +535,6 @@ classes:
     infra_ca_rp: null
     mailclient: *id002
     nrpe: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   kvmmeta-fre-3.komreg.net:
@@ -586,7 +557,6 @@ classes:
     infra_ca_rp: null
     mailclient: *id002
     nrpe: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   kvmmeta-tug-3.komreg.net:
@@ -609,7 +579,6 @@ classes:
     infra_ca_rp: null
     mailclient: *id002
     nrpe: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   log-1.sveidas.se:
@@ -619,8 +588,7 @@ classes:
     infra_ca_rp: null
     mailclient: *id002
     nrpe: null
-    sunet::ntp: *id004
-    sunet::rsyslog: &id008 {udp_client: 94.176.224.0/24, udp_port: 514}
+    sunet::rsyslog: &id007 {udp_client: 94.176.224.0/24, udp_port: 514}
     sunetops: null
   log-2.sveidas.se:
     autoupdate: null
@@ -629,8 +597,7 @@ classes:
     infra_ca_rp: null
     mailclient: *id002
     nrpe: null
-    sunet::ntp: *id004
-    sunet::rsyslog: *id008
+    sunet::rsyslog: *id007
     sunetops: null
   log.qa.sveidas.se:
     autoupdate: null
@@ -639,7 +606,6 @@ classes:
     infra_ca_rp: null
     mailclient: *id002
     nrpe: null
-    sunet::ntp: *id004
     sunet::rsyslog: {udp_port: 514}
     sunet_iaas_cloud: null
     sunetops: null
@@ -656,7 +622,6 @@ classes:
     metadatamgrs: null
     nrpe: null
     openstack_dockerhost: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunet_iaas_cloud: null
     sunetops: null
@@ -672,7 +637,6 @@ classes:
     metadatamgrs: null
     nrpe: null
     openstack_dockerhost: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunet_iaas_cloud: null
     sunetops: null
@@ -684,7 +648,6 @@ classes:
     mailclient: *id002
     nagios_monitor: null
     nrpe: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   natmd-1.komreg.net:
@@ -700,7 +663,6 @@ classes:
     md_signer: {dest_host: natpub-1.komreg.net, name: natmd-prod}
     metadatamgrs: null
     nrpe: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   natmd-2.komreg.net:
@@ -716,7 +678,6 @@ classes:
     md_signer: {dest_host: natpub-2.komreg.net, name: natmd-prod}
     metadatamgrs: null
     nrpe: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   natpub-1.komreg.net:
@@ -732,7 +693,6 @@ classes:
         md.swedenconnect.se:
           frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net]
           port: '443'
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   natpub-2.komreg.net:
@@ -748,7 +708,6 @@ classes:
         md.swedenconnect.se:
           frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net]
           port: '443'
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   nic.komreg.net:
@@ -760,7 +719,6 @@ classes:
     mailclient: *id002
     nagios_monitor: null
     nrpe: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunet_iaas_cloud: null
     sunetops: null
@@ -777,7 +735,6 @@ classes:
         qa.md.swedenconnect.se:
           frontends: [se-fre-lb-1.sunet.se, se-tug-lb-1.sunet.se]
           port: '443'
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunet_iaas_cloud: null
     sunetops: null
@@ -794,7 +751,6 @@ classes:
         qa.md.eidas.swedenconnect.se:
           frontends: [se-fre-lb-1.sunet.se, se-tug-lb-1.sunet.se]
           port: '443'
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunet_iaas_cloud: null
     sunetops: null
@@ -809,7 +765,6 @@ classes:
     openstack_dockerhost: null
     prid: {clients: prid_qa_clients, version: 1.0.1}
     servicemonitor: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunet_iaas_cloud: null
     sunetops: null
@@ -822,9 +777,8 @@ classes:
     konsulter: null
     mailclient: *id002
     nrpe: null
-    prid: &id009 {clients: prid_prod_clients, version: 1.0.1}
+    prid: &id008 {clients: prid_prod_clients, version: 1.0.1}
     servicemonitor: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   prid-2.sveidas.se:
@@ -836,9 +790,8 @@ classes:
     konsulter: null
     mailclient: *id002
     nrpe: null
-    prid: *id009
+    prid: *id008
     servicemonitor: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunetops: null
   r1.komreg.net:
@@ -851,7 +804,6 @@ classes:
     nrpe: null
     openstack_dockerhost: null
     sunet::dehydrated: null
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunet_iaas_cloud: null
     sunetops: null
@@ -869,7 +821,6 @@ classes:
         qa.test.swedenconnect.se:
           frontends: [se-fre-lb-1.sunet.se, se-tug-lb-1.sunet.se]
           port: '443'
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunet_iaas_cloud: null
     sunetops: null
@@ -890,7 +841,6 @@ classes:
         qa.test.swedenconnect.se:
           frontends: [se-fre-lb-1.sunet.se, se-tug-lb-1.sunet.se]
           port: '443'
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunet_iaas_cloud: null
     sunetops: null
@@ -908,7 +858,6 @@ classes:
         swedenconnect.se:
           frontends: [se-fre-lb-1.sunet.se, se-tug-lb-1.sunet.se]
           port: '443'
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunet_iaas_cloud: null
     sunetops: null
@@ -928,7 +877,6 @@ classes:
         swedenconnect.se:
           frontends: [se-fre-lb-1.sunet.se, se-tug-lb-1.sunet.se]
           port: '80'
-    sunet::ntp: *id004
     sunet::rsyslog: null
     sunet_iaas_cloud: null
     sunetops: null
@@ -1084,20 +1032,6 @@ members:
     eupub-1.komreg.net, eupub-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net,
     p1.komreg.net, p2.qa.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se,
     validator-1.qa.komreg.net, web-1.qa.sveidas.se]
-  sunet::ntp: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se,
-    eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
-    eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se,
-    eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se,
-    eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net,
-    kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net,
-    kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net,
-    log-1.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net,
-    monitor-fre-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natpub-1.komreg.net,
-    natpub-2.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se,
-    prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se,
-    validator-1.qa.komreg.net, web-1.qa.sveidas.se]
   sunet::rsyslog: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se,
     eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
     eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se,