From fd83f9eef82a9c16fc42aebbe84d4209f6d0be6a Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Mon, 10 Jun 2019 16:35:11 +0200 Subject: [PATCH 1/3] removed 'frontendtools_volumes: false' from web instance configuration --- fe-common/overlay/etc/hiera/data/group.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/fe-common/overlay/etc/hiera/data/group.yaml b/fe-common/overlay/etc/hiera/data/group.yaml index 3436917b..6691c423 100644 --- a/fe-common/overlay/etc/hiera/data/group.yaml +++ b/fe-common/overlay/etc/hiera/data/group.yaml @@ -52,7 +52,6 @@ sunet_frontend: letsencrypt_server: 'acme-c.sunet.se' haproxy_imagetag: 'stable' frontendtools_imagetag: 'stable' - frontendtools_volumes: false 'mdeidas': site_name: 'md.eidas.swedenconnect.se' @@ -74,7 +73,6 @@ sunet_frontend: letsencrypt_server: 'acme-c.sunet.se' haproxy_imagetag: 'stable' frontendtools_imagetag: 'stable' - frontendtools_volumes: false 'test': site_name: 'test.swedenconnect.se' @@ -96,7 +94,6 @@ sunet_frontend: letsencrypt_server: 'acme-c.sunet.se' haproxy_imagetag: 'stable' frontendtools_imagetag: 'stable' - frontendtools_volumes: false 'proxy': site_name: 'proxy.eidas.swedenconnect.se' @@ -124,7 +121,6 @@ sunet_frontend: letsencrypt_server: 'acme-c.sunet.se' haproxy_imagetag: 'stable' frontendtools_imagetag: 'stable' - frontendtools_volumes: false 'md': site_name: 'md.swedenconnect.se' @@ -146,7 +142,6 @@ sunet_frontend: letsencrypt_server: 'acme-c.sunet.se' haproxy_imagetag: 'stable' frontendtools_imagetag: 'stable' - frontendtools_volumes: false 'demweidas': site_name: 'demw.eidas.swedenconnect.se' @@ -168,4 +163,3 @@ sunet_frontend: tls_certificate_bundle: /etc/ssl/certs/demw_eidas_swedenconnect_se.pem haproxy_imagetag: 'stable' frontendtools_imagetag: 'stable' - frontendtools_volumes: false From ae3047b0410694fd53ee013719e4d2996fb5a65c Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Fri, 14 Jun 2019 09:39:04 +0200 Subject: [PATCH 2/3] update db --- global/overlay/etc/puppet/cosmos-db.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index 52261625..a2081c7c 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -440,7 +440,7 @@ classes: common: null eid::kvmhost: vms: - demw-1.komreg.net: {bridge: br-demw, cpus: '16', description: eid deutsche + demw-1.sveidas.se: {bridge: br-demw, cpus: '16', description: eid deutsche middleware, gateway: 94.176.224.249, image_url: 'https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img', ip: 94.176.224.252, mac: '52:54:20:01:05:01', memory: '32768', netmask: 255.255.255.248} entropyclient: null From 049f0d99cbb77b707972891d0e71ea5a86bc9b0f Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Fri, 14 Jun 2019 09:39:43 +0200 Subject: [PATCH 3/3] Added configurations for demw-*.sveidas.se --- global/overlay/etc/puppet/cosmos-rules.yaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 0b8a5772..7f18a0e4 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -366,7 +366,7 @@ kvmeidas-fre-3.komreg.net: kvmdemw-fre-3a.komreg.net: eid::kvmhost: vms: - demw-1.komreg.net: + demw-1.sveidas.se: mac: '52:54:20:01:05:01' ip: '94.176.224.252' netmask: '255.255.255.248' @@ -616,6 +616,18 @@ md-eu1.qa.komreg.net: - 'fe-tug-3.komreg.net' port: '443' +'^demw-[0-9]+\.sveidas\.se$': + 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' + '^refidp-[0-9]+\.qa\.sveidas\.se$': sunet_iaas_cloud: eid::dockerhost: