swedenconnect/eid-ops
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of gitops.sunet.se:eid-ops

Browse source
This commit is contained in:
Leif Johansson 2019-06-14 09:45:39 +02:00
commit 7209ed2185
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fe-common/overlay/etc/hiera/data/group.yaml
View file

@ -52,7 +52,6 @@ sunet_frontend:
letsencrypt_server: 'acme-c.sunet.se' letsencrypt_server: 'acme-c.sunet.se'
haproxy_imagetag: 'stable' haproxy_imagetag: 'stable'
frontendtools_imagetag: 'stable' frontendtools_imagetag: 'stable'
frontendtools_volumes: false
'mdeidas': 'mdeidas':
site_name: 'md.eidas.swedenconnect.se' site_name: 'md.eidas.swedenconnect.se'
@ -74,7 +73,6 @@ sunet_frontend:
letsencrypt_server: 'acme-c.sunet.se' letsencrypt_server: 'acme-c.sunet.se'
haproxy_imagetag: 'stable' haproxy_imagetag: 'stable'
frontendtools_imagetag: 'stable' frontendtools_imagetag: 'stable'
frontendtools_volumes: false
'test': 'test':
site_name: 'test.swedenconnect.se' site_name: 'test.swedenconnect.se'
@ -96,7 +94,6 @@ sunet_frontend:
letsencrypt_server: 'acme-c.sunet.se' letsencrypt_server: 'acme-c.sunet.se'
haproxy_imagetag: 'stable' haproxy_imagetag: 'stable'
frontendtools_imagetag: 'stable' frontendtools_imagetag: 'stable'
frontendtools_volumes: false
'proxy': 'proxy':
site_name: 'proxy.eidas.swedenconnect.se' site_name: 'proxy.eidas.swedenconnect.se'
@ -124,7 +121,6 @@ sunet_frontend:
letsencrypt_server: 'acme-c.sunet.se' letsencrypt_server: 'acme-c.sunet.se'
haproxy_imagetag: 'stable' haproxy_imagetag: 'stable'
frontendtools_imagetag: 'stable' frontendtools_imagetag: 'stable'
frontendtools_volumes: false
'md': 'md':
site_name: 'md.swedenconnect.se' site_name: 'md.swedenconnect.se'
@ -146,7 +142,6 @@ sunet_frontend:
letsencrypt_server: 'acme-c.sunet.se' letsencrypt_server: 'acme-c.sunet.se'
haproxy_imagetag: 'stable' haproxy_imagetag: 'stable'
frontendtools_imagetag: 'stable' frontendtools_imagetag: 'stable'
frontendtools_volumes: false
'demweidas': 'demweidas':
site_name: 'demw.eidas.swedenconnect.se' site_name: 'demw.eidas.swedenconnect.se'
@ -168,4 +163,3 @@ sunet_frontend:
tls_certificate_bundle: /etc/ssl/certs/demw_eidas_swedenconnect_se.pem tls_certificate_bundle: /etc/ssl/certs/demw_eidas_swedenconnect_se.pem
haproxy_imagetag: 'stable' haproxy_imagetag: 'stable'
frontendtools_imagetag: 'stable' frontendtools_imagetag: 'stable'
frontendtools_volumes: false

2
global/overlay/etc/puppet/cosmos-db.yaml
View file

@ -440,7 +440,7 @@ classes:
common: null common: null
eid::kvmhost: eid::kvmhost:
vms: 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', 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} ip: 94.176.224.252, mac: '52:54:20:01:05:01', memory: '32768', netmask: 255.255.255.248}
entropyclient: null entropyclient: null

14
global/overlay/etc/puppet/cosmos-rules.yaml
View file

@ -366,7 +366,7 @@ kvmeidas-fre-3.komreg.net:
kvmdemw-fre-3a.komreg.net: kvmdemw-fre-3a.komreg.net:
eid::kvmhost: eid::kvmhost:
vms: vms:
demw-1.komreg.net: demw-1.sveidas.se:
mac: '52:54:20:01:05:01' mac: '52:54:20:01:05:01'
ip: '94.176.224.252' ip: '94.176.224.252'
netmask: '255.255.255.248' netmask: '255.255.255.248'
@ -616,6 +616,18 @@ md-eu1.qa.komreg.net:
- 'fe-tug-3.komreg.net' - 'fe-tug-3.komreg.net'
port: '443' 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$': '^refidp-[0-9]+\.qa\.sveidas\.se$':
sunet_iaas_cloud: sunet_iaas_cloud:
eid::dockerhost: eid::dockerhost: