From 4c699de32d9b2fe268d4c8dde3ce01fa264b16d9 Mon Sep 17 00:00:00 2001
From: Maria Haider <mariah@nordu.net>
Date: Fri, 14 Jun 2019 10:36:18 +0200
Subject: [PATCH] Two changes

1. added demw-2.sveidas.se to be created in the KVM host
2. removed demw-*.komreg.net from the repository
---
 demw-1.komreg.net/README                      |  3 ---
 .../overlay/etc/hiera/data/local.eyaml        | 23 -------------------
 demw-2.komreg.net/README                      |  3 ---
 global/overlay/etc/puppet/cosmos-rules.yaml   | 14 +----------
 4 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 demw-1.komreg.net/README
 delete mode 100644 demw-1.komreg.net/overlay/etc/hiera/data/local.eyaml
 delete mode 100644 demw-2.komreg.net/README

diff --git a/demw-1.komreg.net/README b/demw-1.komreg.net/README
deleted file mode 100644
index a18dac1c..00000000
--- a/demw-1.komreg.net/README
+++ /dev/null
@@ -1,3 +0,0 @@
-
-The system documentation is in the docs directory of the multiverse repository.
-
diff --git a/demw-1.komreg.net/overlay/etc/hiera/data/local.eyaml b/demw-1.komreg.net/overlay/etc/hiera/data/local.eyaml
deleted file mode 100644
index 3af4af86..00000000
--- a/demw-1.komreg.net/overlay/etc/hiera/data/local.eyaml
+++ /dev/null
@@ -1,23 +0,0 @@
-
----
-spring_datasource_password: ENC[PKCS7,MIIC2gYJKoZIhvcNAQcDoIICyzCCAscCAQAxggJyMIICbgIBADBWMEkxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxGjAYBgNVBAMMEWRlbXctMS5rb21yZWcubmV0AgkApsJQ+dhUjogwDQYJKoZIhvcNAQEBBQAEggIAsW4bupVVtHNx0BJMRMRu+1j89sfJKyJyPSJOtV0/dxxF45VuIYztH73rzjVIK+R6zitj8Nc8Ck1E2ZDNlWWv5sJ9nuo9PsiLZ0yymu70vm9pVGURgygUzSBaC2ezSf/4RijtQsYNwrmd/SRWbOovH9aOcjhjPNpTVa9QPjhQLVc5T/t8GleTouRVuL6aSjdG3xbST7DnTb/w0JCRMP/cqarvxIWSkLNJkWEbL8uAHoT/whOKi8Wv0+MNnvYr/Al1lCh4Ee+9QsuO2/9eJgR3JbuT6Ib6AMoGcxawBd2Y3wkIT/uHw/vwP1sFGS7g3dhL66XBqcFbMKs62FIfvBUItyiYW6OhhvDMsCWkB7zag2K+XAuIK+Eb4mM4G61d9udKp95Ft7hOqNDdQgi3E9eE3KQHucl/SnTCojyfVfJ7SMYZ5rbyaBzUPw+tlwwRhGcWPf14Nq5k7gfuRTbLbxUbD4WCrTnt1gbedKIt36RM/jBHYS1VHESZUHu0Vzi4U2kI3OlvqagL3XZ1q6iuoOb1xMYalC2tk7HaiwFbHHSxEeCHqo3i3YiXZEsuF9clUAdXJS+SyIkVvMfO+hr4WmzlhdvZV0tS51XiZOP0GB5Ar6kwyTaTu/eMXapBhk5CsEZPc1UdVDFuN+v2jgVmriCTlVJH2ng7Kq7u8jv+Qi7odb4wTAYJKoZIhvcNAQcBMB0GCWCGSAFlAwQBKgQQBx0Muy+Y/aO2R6xGqkP+MIAgNaKhn+kxznY7GGlAZv2MQJWvRfoCKtyYbh3QIxIPD8Q=]
-
-poseidas_admin_hashed_password: >
-   ENC[PKCS7,MIIC+gYJKoZIhvcNAQcDoIIC6zCCAucCAQAxggJyMIICbgIBADBWMEkxCzAJ
-   BgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxGjAY
-   BgNVBAMMEWRlbXctMS5rb21yZWcubmV0AgkApsJQ+dhUjogwDQYJKoZIhvcN
-   AQEBBQAEggIAUaFKn3R4GDJGPbbWSOfCJ78BlCR/iypMYUbAS8tJvs3k9S/G
-   OliqkoxXcxFNdySxfXQxnHe6h30vk/jhYs+zuiKX9+HpAzMaulmv4Oql3f2y
-   U+vNXvh4PdP83CtkWqV4sonDSx5DaXhnqf6GtohyVdaHeuz3Rnqh7MlP4cZ+
-   2oKWyVpifqbjJWV+9L/1L2kK1g4w+E9PMdu6wWbTo9pnH2iA030LmyRwSFSB
-   KQCPe6Rcp6JB0a9L8Z6zEuqvXwMeLqiQpY74PGJiLKExAKS4J2QNPXXczMzC
-   Bv9IeyN0BogxNJOeRtX3WNHUcegjctYvLRbkBQO1FS4iPH7ARhEPFlFMblPq
-   cNiTc3uRYdkZ5qeR7/E9Pw0M/RIc1Dsi3ekUNlZx/jKcxOfPk5FeEge83qyV
-   t36cmG1TQo6Lq53//IJBT8+28uKn/F0VWp5SXJ4+CbcPVxPYStIJxWguh+ji
-   9fBTziR8H4w7rTAhsoEQ8mgNRks/mly2+sTCPdSgnA1RjE2xG0JkH/p6w6oJ
-   tfRY95s1NYPWbYcvXlCevWKxC3e+pkBPBwIA5TWa6sfLlhYDemySX7viHD8J
-   ftRCjyly8DkGLvXIRqMy8F8WOsdcL6lP+Z8+0Xp23Xdi8+W7iC1L9m82olil
-   RVgUjpBYDRMEfbPZh4PKCA7ba3Qq+5Yuk3EwbAYJKoZIhvcNAQcBMB0GCWCG
-   SAFlAwQBKgQQDra1CrFR/lw4UaKRSgAPSIBAE9h0pkNxD2hT02B6QQV7lEZs
-   SXOClnq1n8Rm6xe73ZOvHHGT/0oL9a4J8495hZ1j4eNbrA+qY5EfVs7mV7rQ
-   Jg==]
diff --git a/demw-2.komreg.net/README b/demw-2.komreg.net/README
deleted file mode 100644
index a18dac1c..00000000
--- a/demw-2.komreg.net/README
+++ /dev/null
@@ -1,3 +0,0 @@
-
-The system documentation is in the docs directory of the multiverse repository.
-
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 7f18a0e4..14e3357b 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -380,7 +380,7 @@ kvmdemw-fre-3a.komreg.net:
 kvmdemw-fre-3b.komreg.net:
    eid::kvmhost:
       vms:
-         demw-2.komreg.net:
+         demw-2.sveidas.se:
             mac: '52:54:20:01:05:02'
             ip: '94.176.224.253'
             netmask: '255.255.255.248'
@@ -604,18 +604,6 @@ md-eu1.qa.komreg.net:
            - 'se-tug-lb-1.sunet.se'
          port: '443'
 
-'^demw-[0-9]+\.komreg\.net$':
-   eid::dockerhost:
-   konsulter:
-   autoupdate:
-   sunet::frontend::register_sites:
-     sites:
-       'demw.eidas.swedenconnect.se':
-         frontends:
-           - 'fe-fre-3.komreg.net'
-           - 'fe-tug-3.komreg.net'
-         port: '443'
-
 '^demw-[0-9]+\.sveidas\.se$':
    eid::dockerhost:
    konsulter: