From a270a73da7f21147d153ae1a6167f2e77763d216 Mon Sep 17 00:00:00 2001 From: Patrik Holmqvist Date: Wed, 5 Feb 2025 12:38:38 +0100 Subject: [PATCH] Change to new proxy servers in test, SC-2522 --- .../overlay/etc/hiera/data/group.yaml | 8 +++---- global/overlay/etc/puppet/cosmos-rules.yaml | 21 ++++++++++++------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/fe-test-common/overlay/etc/hiera/data/group.yaml b/fe-test-common/overlay/etc/hiera/data/group.yaml index b131d467..7f1e19f7 100644 --- a/fe-test-common/overlay/etc/hiera/data/group.yaml +++ b/fe-test-common/overlay/etc/hiera/data/group.yaml @@ -101,11 +101,11 @@ sunet_frontend: ips: ['94.176.226.133', '2001:6b0:65:2::133'] backends: default: - 'eidas-proxy-1.test.sveidas.se': - ips: ['89.45.237.104'] + 'proxy-test-sto3-1.komreg.net': + ips: ['89.45.236.56', '2001:6b0:40::36a'] server_args: 'ssl check verify none cookie p1' - 'eidas-proxy-2.test.sveidas.se': - ips: ['89.45.236.227'] + 'proxy-test-sto3-2.komreg.net': + ips: ['89.45.237.141', '2001:6b0:40::20c'] server_args: 'ssl check verify none cookie p2' allow_ports: - 443 diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index e464eb5f..9dc0a76c 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -1169,13 +1169,6 @@ log-1.sveidas.se: version: 3.0.8_hsm2 hostname: test.proxy.eidas.swedenconnect.se spring_config_param: SPRING_CONFIG_ADDITIONAL_LOCATION - sunet::frontend::register_sites: - sites: - 'test.proxy.eidas.swedenconnect.se': - frontends: - - 'fe-fre-1.test.komreg.net' - - 'fe-tug-1.test.komreg.net' - port: '443' '^prid-[0-9]+\.qa\.sveidas\.se$': konsulter: @@ -1359,6 +1352,13 @@ proxy-test-sto3-1.komreg.net: eid::proxy: version: 3.0.8_hsm2 service_name: test.proxy.eidas.swedenconnect.se + sunet::frontend::register_sites: + sites: + 'test.proxy.eidas.swedenconnect.se': + frontends: + - 'fe-fre-1.test.komreg.net' + - 'fe-tug-1.test.komreg.net' + port: '443' proxy-test-sto3-2.komreg.net: autoupdate: @@ -1366,3 +1366,10 @@ proxy-test-sto3-2.komreg.net: eid::proxy: version: 3.0.8_hsm2 service_name: test.proxy.eidas.swedenconnect.se + sunet::frontend::register_sites: + sites: + 'test.proxy.eidas.swedenconnect.se': + frontends: + - 'fe-fre-1.test.komreg.net' + - 'fe-tug-1.test.komreg.net' + port: '443'