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

Merge branch 'master' of git.nordu.net:eid-ops

Browse source
This commit is contained in:
Leif Johansson 2018-06-28 19:20:04 +02:00
commit 539a6232f8
3 changed files with 85 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -404,6 +404,18 @@ classes:
sunetops: null
kvminfra-tug-3.komreg.net:
common: null
eid::kvmhost:
vms:
log-2.sveidas.se:
bridge: br-infra
cpus: '4'
description: eid tug log
gateway: 94.176.224.97
ip: 94.176.224.102
mac: '52:54:20:02:02:01'
memory: '4096'
netmask: 255.255.255.240
search: [sveidas.se]
entropyclient: null
infra_ca_rp: null
mailclient: *id002
@ -438,7 +450,16 @@ classes:
infra_ca_rp: null
mailclient: *id002
nrpe: null
sunet::rsyslog: {udp_client: 94.176.224.0/24, udp_port: 514}
sunet::rsyslog: &id005 {udp_client: 94.176.224.0/24, udp_port: 514}
sunetops: null
log-2.sveidas.se:
autoupdate: null
common: null
entropyclient: null
infra_ca_rp: null
mailclient: *id002
nrpe: null
sunet::rsyslog: *id005
sunetops: null
log.qa.sveidas.se:
autoupdate: null
@ -570,7 +591,7 @@ classes:
konsulter: null
mailclient: *id002
nrpe: null
prid: &id005 {clients: prid_prod_clients, version: 1.0.1}
prid: &id006 {clients: prid_prod_clients, version: 1.0.1}
servicemonitor: null
sunet::rsyslog: null
sunetops: null
@ -583,7 +604,7 @@ classes:
konsulter: null
mailclient: *id002
nrpe: null
prid: *id005
prid: *id006
servicemonitor: null
sunet::rsyslog: null
sunetops: null
@ -645,19 +666,20 @@ members:
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.qa.sveidas.se,
md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.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, validator-1.qa.komreg.net, web-1.qa.sveidas.se]
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, md-fre-3.komreg.net, md1.komreg.net,
monitor-fre-3.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, validator-1.qa.komreg.net,
web-1.qa.sveidas.se]
autoupdate: [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,
jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, log-1.sveidas.se,
log.qa.sveidas.se, md-eu1.qa.komreg.net, md-eu1.qa.komreg.net, md-fre-3.komreg.net,
md1.komreg.net, monitor-fre-3.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, validator-1.qa.komreg.net,
web-1.qa.sveidas.se]
log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md-eu1.qa.komreg.net,
md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.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, validator-1.qa.komreg.net, web-1.qa.sveidas.se]
common: [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,
@ -665,17 +687,19 @@ members:
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.qa.sveidas.se,
md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.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, validator-1.qa.komreg.net, web-1.qa.sveidas.se]
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, md-fre-3.komreg.net, md1.komreg.net,
monitor-fre-3.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, validator-1.qa.komreg.net,
web-1.qa.sveidas.se]
eid::dockerhost: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se,
eidas-connector-4.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, fe-fre-3.komreg.net, fe-tug-3.komreg.net, prid-1.sveidas.se,
prid-2.sveidas.se]
eid::kvmhost: [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, kvmmeta-fre-3.komreg.net]
kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net,
kvmmeta-fre-3.komreg.net]
eidas_connector: [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: [eidas-proxy-1.qa.sveidas.se]
@ -686,10 +710,11 @@ members:
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.qa.sveidas.se,
md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.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, validator-1.qa.komreg.net, web-1.qa.sveidas.se]
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, md-fre-3.komreg.net, md1.komreg.net,
monitor-fre-3.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, validator-1.qa.komreg.net,
web-1.qa.sveidas.se]
github_client_credential: [web-1.qa.sveidas.se]
infra_ca_rp: [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,
@ -698,10 +723,11 @@ members:
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.qa.sveidas.se,
md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.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, validator-1.qa.komreg.net, web-1.qa.sveidas.se]
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, md-fre-3.komreg.net, md1.komreg.net,
monitor-fre-3.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, validator-1.qa.komreg.net,
web-1.qa.sveidas.se]
konsulter: [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,
jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, md-eu1.qa.komreg.net,
@ -714,10 +740,11 @@ members:
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.qa.sveidas.se,
md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.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, validator-1.qa.komreg.net, web-1.qa.sveidas.se]
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, md-fre-3.komreg.net, md1.komreg.net,
monitor-fre-3.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, validator-1.qa.komreg.net,
web-1.qa.sveidas.se]
md_publisher: [p1.komreg.net, p2.qa.komreg.net]
md_repo_client: [md-eu1.qa.komreg.net, md-fre-3.komreg.net]
md_repo_server: [r1.komreg.net]
@ -732,10 +759,11 @@ members:
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.qa.sveidas.se,
md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.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, validator-1.qa.komreg.net, web-1.qa.sveidas.se]
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, md-fre-3.komreg.net, md1.komreg.net,
monitor-fre-3.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, validator-1.qa.komreg.net,
web-1.qa.sveidas.se]
openstack_dockerhost: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
md-eu1.qa.komreg.net, md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net,
prid-1.qa.sveidas.se, r1.komreg.net, validator-1.qa.komreg.net, web-1.qa.sveidas.se]
@ -761,10 +789,10 @@ members:
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-1.sveidas.se,
log.qa.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md-fre-3.komreg.net,
md1.komreg.net, monitor-fre-3.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, validator-1.qa.komreg.net,
web-1.qa.sveidas.se]
log-2.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net,
md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.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, validator-1.qa.komreg.net, web-1.qa.sveidas.se]
sunet_iaas_cloud: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net,
log.qa.sveidas.se, md-eu1.qa.komreg.net, md-eu1.qa.komreg.net, md-fre-3.komreg.net,
md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se,
@ -776,9 +804,10 @@ members:
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.qa.sveidas.se,
md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.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, validator-1.qa.komreg.net, web-1.qa.sveidas.se]
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, md-fre-3.komreg.net, md1.komreg.net,
monitor-fre-3.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, validator-1.qa.komreg.net,
web-1.qa.sveidas.se]
validator: [validator-1.qa.komreg.net]

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

@ -33,7 +33,19 @@ kvmfe-tug-3.komreg.net:
cpus: '4'
memory: '4096'
# kvminfra-tug-3.komreg.net:
kvminfra-tug-3.komreg.net:
eid::kvmhost:
vms:
log-2.sveidas.se:
mac: '52:54:20:02:02:01'
ip: '94.176.224.102'
netmask: '255.255.255.240'
gateway: '94.176.224.97'
bridge: 'br-infra'
search: ['sveidas.se']
description: 'eid tug log'
cpus: '4'
memory: '4096'
# kvmmeta-tug-3.komreg.net:

3
log-2.sveidas.se/README Normal file
View file

@ -0,0 +1,3 @@
The system documentation is in the docs directory of the multiverse repository.