From 3be42d23b9667c558c2150da504deffad2ae6479 Mon Sep 17 00:00:00 2001 From: Fredrik Kjellman Date: Wed, 26 Jan 2022 14:54:39 +0100 Subject: [PATCH 1/4] natpub-test-1-komreg.net added --- natpub-test-1-komreg.net/README | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 natpub-test-1-komreg.net/README diff --git a/natpub-test-1-komreg.net/README b/natpub-test-1-komreg.net/README new file mode 100644 index 00000000..a18dac1c --- /dev/null +++ b/natpub-test-1-komreg.net/README @@ -0,0 +1,3 @@ + +The system documentation is in the docs directory of the multiverse repository. + From f3bb0b39e438fe299010a6ef65d13d099f9afe8d Mon Sep 17 00:00:00 2001 From: Fredrik Kjellman Date: Wed, 26 Jan 2022 14:59:03 +0100 Subject: [PATCH 2/4] update db --- global/overlay/etc/puppet/cosmos-db.yaml | 99 +++++++++++++----------- 1 file changed, 54 insertions(+), 45 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index 364686a9..392571d4 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -1164,6 +1164,15 @@ classes: sunet::rsyslog: null sunet::server: *id002 sunetops: null + natpub-test-1-komreg.net: + common: null + entropyclient: null + infra_ca_rp: null + mailclient: *id001 + nrpe: null + sunet::rsyslog: null + sunet::server: *id002 + sunetops: null nic.komreg.net: autoupdate: null common: null @@ -1459,11 +1468,11 @@ members: log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.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-1.test.sveidas.se, prid-2.sveidas.se, prid-2.test.sveidas.se, - r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, test-1.test.sveidas.se, - validator-1.komreg.net, validator-1.qa.komreg.net, validator-1.test.komreg.net, - validator-2.komreg.net, web-1.qa.sveidas.se] + natpub-2.komreg.net, natpub-test-1-komreg.net, nic.komreg.net, p1.komreg.net, + p2.qa.komreg.net, prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-1.test.sveidas.se, + prid-2.sveidas.se, prid-2.test.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, + test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, validator-1.qa.komreg.net, + validator-1.test.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se] autoupdate: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se, eidas-connector-1.test.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-2.test.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se, @@ -1499,11 +1508,11 @@ members: log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.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-1.test.sveidas.se, prid-2.sveidas.se, prid-2.test.sveidas.se, - r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, test-1.test.sveidas.se, - validator-1.komreg.net, validator-1.qa.komreg.net, validator-1.test.komreg.net, - validator-2.komreg.net, web-1.qa.sveidas.se] + natpub-2.komreg.net, natpub-test-1-komreg.net, nic.komreg.net, p1.komreg.net, + p2.qa.komreg.net, prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-1.test.sveidas.se, + prid-2.sveidas.se, prid-2.test.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, + test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, validator-1.qa.komreg.net, + validator-1.test.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se] eid::dockerhost: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se, eidas-connector-1.test.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-2.test.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se, @@ -1553,11 +1562,11 @@ members: log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.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-1.test.sveidas.se, prid-2.sveidas.se, prid-2.test.sveidas.se, - r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, test-1.test.sveidas.se, - validator-1.komreg.net, validator-1.qa.komreg.net, validator-1.test.komreg.net, - validator-2.komreg.net, web-1.qa.sveidas.se] + natpub-2.komreg.net, natpub-test-1-komreg.net, nic.komreg.net, p1.komreg.net, + p2.qa.komreg.net, prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-1.test.sveidas.se, + prid-2.sveidas.se, prid-2.test.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, + test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, validator-1.qa.komreg.net, + validator-1.test.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se] fe_servers: [fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.komreg.net, fe-tug-3.komreg.net] github_client_credential: [web-1.qa.sveidas.se] @@ -1578,11 +1587,11 @@ members: log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.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-1.test.sveidas.se, prid-2.sveidas.se, prid-2.test.sveidas.se, - r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, test-1.test.sveidas.se, - validator-1.komreg.net, validator-1.qa.komreg.net, validator-1.test.komreg.net, - validator-2.komreg.net, web-1.qa.sveidas.se] + natpub-2.komreg.net, natpub-test-1-komreg.net, nic.komreg.net, p1.komreg.net, + p2.qa.komreg.net, prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-1.test.sveidas.se, + prid-2.sveidas.se, prid-2.test.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, + test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, validator-1.qa.komreg.net, + validator-1.test.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se] jumphosts: [jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net] konsulter: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se, eidas-connector-1.test.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-2.test.sveidas.se, @@ -1613,11 +1622,11 @@ members: log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.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-1.test.sveidas.se, prid-2.sveidas.se, prid-2.test.sveidas.se, - r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, test-1.test.sveidas.se, - validator-1.komreg.net, validator-1.qa.komreg.net, validator-1.test.komreg.net, - validator-2.komreg.net, web-1.qa.sveidas.se] + natpub-2.komreg.net, natpub-test-1-komreg.net, nic.komreg.net, p1.komreg.net, + p2.qa.komreg.net, prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-1.test.sveidas.se, + prid-2.sveidas.se, prid-2.test.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, + test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, validator-1.qa.komreg.net, + validator-1.test.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se] md_publisher: [eupub-1.komreg.net, eupub-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, p1.komreg.net, p2.qa.komreg.net] md_repo_client: [eumd-1.komreg.net, eumd-2.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net, @@ -1647,11 +1656,11 @@ members: log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.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-1.test.sveidas.se, prid-2.sveidas.se, prid-2.test.sveidas.se, - r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, test-1.test.sveidas.se, - validator-1.komreg.net, validator-1.qa.komreg.net, validator-1.test.komreg.net, - validator-2.komreg.net, web-1.qa.sveidas.se] + natpub-2.komreg.net, natpub-test-1-komreg.net, nic.komreg.net, p1.komreg.net, + p2.qa.komreg.net, prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-1.test.sveidas.se, + prid-2.sveidas.se, prid-2.test.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, + test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, validator-1.qa.komreg.net, + validator-1.test.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se] openstack_dockerhost: [web-1.qa.sveidas.se] pages: [web-1.qa.sveidas.se] prid: [prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se] @@ -1696,11 +1705,11 @@ members: log-2.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.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-1.test.sveidas.se, prid-2.sveidas.se, prid-2.test.sveidas.se, r1.komreg.net, - refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, - validator-1.qa.komreg.net, validator-1.test.komreg.net, validator-2.komreg.net, - web-1.qa.sveidas.se] + natpub-test-1-komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, + prid-1.sveidas.se, prid-1.test.sveidas.se, prid-2.sveidas.se, prid-2.test.sveidas.se, + r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, test-1.test.sveidas.se, + validator-1.komreg.net, validator-1.qa.komreg.net, validator-1.test.komreg.net, + validator-2.komreg.net, web-1.qa.sveidas.se] sunet::server: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se, eidas-connector-1.test.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-2.test.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se, @@ -1719,11 +1728,11 @@ members: log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.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-1.test.sveidas.se, prid-2.sveidas.se, prid-2.test.sveidas.se, - r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, test-1.test.sveidas.se, - validator-1.komreg.net, validator-1.qa.komreg.net, validator-1.test.komreg.net, - validator-2.komreg.net, web-1.qa.sveidas.se] + natpub-2.komreg.net, natpub-test-1-komreg.net, nic.komreg.net, p1.komreg.net, + p2.qa.komreg.net, prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-1.test.sveidas.se, + prid-2.sveidas.se, prid-2.test.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, + test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, validator-1.qa.komreg.net, + validator-1.test.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se] sunet_iaas_cloud: [demw-1.qa.sveidas.se, eidas-connector-1.test.sveidas.se, eidas-connector-2.test.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.test.sveidas.se, eidas-proxy-2.test.sveidas.se, eidastest-1.qa.sveidas.se, jmp.komreg.net, log-1.test.sveidas.se, @@ -1748,11 +1757,11 @@ members: log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.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-1.test.sveidas.se, prid-2.sveidas.se, prid-2.test.sveidas.se, - r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, test-1.test.sveidas.se, - validator-1.komreg.net, validator-1.qa.komreg.net, validator-1.test.komreg.net, - validator-2.komreg.net, web-1.qa.sveidas.se] + natpub-2.komreg.net, natpub-test-1-komreg.net, nic.komreg.net, p1.komreg.net, + p2.qa.komreg.net, prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-1.test.sveidas.se, + prid-2.sveidas.se, prid-2.test.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, + test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, validator-1.qa.komreg.net, + validator-1.test.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se] swedenconnect_refidp: [refidp-1.qa.sveidas.se] test_my_eid: [eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, test-1.qa.sveidas.se, test-1.test.sveidas.se] From 91d68d479fe4531b93db834b6735bdabae038dce Mon Sep 17 00:00:00 2001 From: Fredrik Kjellman Date: Wed, 26 Jan 2022 15:04:48 +0100 Subject: [PATCH 3/4] Add new national metadata publisher for test. --- global/overlay/etc/puppet/cosmos-rules.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 8532a36e..2211caf3 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -534,6 +534,9 @@ natpub-1.komreg.net: - 'fe-tug-3.komreg.net' port: '443' +natpub-test-1-komreg.net: + autoupdate: + eupub-1.komreg.net: autoupdate: md_publisher: From 42fa51dc762148ce2d0925ab0cfa71d5e0b78472 Mon Sep 17 00:00:00 2001 From: Fredrik Kjellman Date: Wed, 26 Jan 2022 15:05:27 +0100 Subject: [PATCH 4/4] update db --- global/overlay/etc/puppet/cosmos-db.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index 392571d4..543b55b8 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -1165,6 +1165,7 @@ classes: sunet::server: *id002 sunetops: null natpub-test-1-komreg.net: + autoupdate: null common: null entropyclient: null infra_ca_rp: null @@ -1486,11 +1487,11 @@ members: jump-tug-3.komreg.net, log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.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-1.test.sveidas.se, prid-2.sveidas.se, - prid-2.test.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, - test-1.test.sveidas.se, validator-1.komreg.net, validator-1.qa.komreg.net, validator-1.test.komreg.net, - validator-2.komreg.net, web-1.qa.sveidas.se] + natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net, nic.komreg.net, + p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-1.test.sveidas.se, + prid-2.sveidas.se, prid-2.test.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, + test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, validator-1.qa.komreg.net, + validator-1.test.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se] common: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se, eidas-connector-1.test.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-2.test.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se,