From 4af1fc0865b64655e64978f0321d6a7a6558797b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bergstro=CC=88m?= Date: Mon, 20 Feb 2023 14:42:44 +0100 Subject: [PATCH] frontend, remove haproxy_stats in test --- fe-test-common/overlay/etc/hiera/data/group.yaml | 2 +- .../overlay/opt/frontend/config/connectortst/haproxy.j2 | 1 - .../overlay/opt/frontend/config/mdeidastest/haproxy.j2 | 1 - fe-test-common/overlay/opt/frontend/config/mdtest/haproxy.j2 | 1 - fe-test-common/overlay/opt/frontend/config/proxytest/haproxy.j2 | 1 - fe-test-common/overlay/opt/frontend/config/testtest/haproxy.j2 | 1 - .../overlay/opt/frontend/config/validatortst/haproxy.j2 | 1 - 7 files changed, 1 insertion(+), 7 deletions(-) diff --git a/fe-test-common/overlay/etc/hiera/data/group.yaml b/fe-test-common/overlay/etc/hiera/data/group.yaml index 47a79510..dfc5aceb 100644 --- a/fe-test-common/overlay/etc/hiera/data/group.yaml +++ b/fe-test-common/overlay/etc/hiera/data/group.yaml @@ -2,7 +2,7 @@ sunet_frontend: load_balancer: - api_imagetag: 'stable' + api_imagetag: 'staging' exabgp_imagetag: 'stable' port80_acme_c_backend: 'letsencrypt_acme-c.sunet.se' static_backends: diff --git a/fe-test-common/overlay/opt/frontend/config/connectortst/haproxy.j2 b/fe-test-common/overlay/opt/frontend/config/connectortst/haproxy.j2 index f3c3826a..4e077c03 100644 --- a/fe-test-common/overlay/opt/frontend/config/connectortst/haproxy.j2 +++ b/fe-test-common/overlay/opt/frontend/config/connectortst/haproxy.j2 @@ -6,7 +6,6 @@ frontend {{ site_name }} {{ bind_ip_tls(bind_ips, 443, tls_certificate_bundle) }} - stats enable timeout http-request 10s timeout http-keep-alive 4s option forwardfor diff --git a/fe-test-common/overlay/opt/frontend/config/mdeidastest/haproxy.j2 b/fe-test-common/overlay/opt/frontend/config/mdeidastest/haproxy.j2 index f3c3826a..4e077c03 100644 --- a/fe-test-common/overlay/opt/frontend/config/mdeidastest/haproxy.j2 +++ b/fe-test-common/overlay/opt/frontend/config/mdeidastest/haproxy.j2 @@ -6,7 +6,6 @@ frontend {{ site_name }} {{ bind_ip_tls(bind_ips, 443, tls_certificate_bundle) }} - stats enable timeout http-request 10s timeout http-keep-alive 4s option forwardfor diff --git a/fe-test-common/overlay/opt/frontend/config/mdtest/haproxy.j2 b/fe-test-common/overlay/opt/frontend/config/mdtest/haproxy.j2 index f3c3826a..4e077c03 100644 --- a/fe-test-common/overlay/opt/frontend/config/mdtest/haproxy.j2 +++ b/fe-test-common/overlay/opt/frontend/config/mdtest/haproxy.j2 @@ -6,7 +6,6 @@ frontend {{ site_name }} {{ bind_ip_tls(bind_ips, 443, tls_certificate_bundle) }} - stats enable timeout http-request 10s timeout http-keep-alive 4s option forwardfor diff --git a/fe-test-common/overlay/opt/frontend/config/proxytest/haproxy.j2 b/fe-test-common/overlay/opt/frontend/config/proxytest/haproxy.j2 index f3c3826a..4e077c03 100644 --- a/fe-test-common/overlay/opt/frontend/config/proxytest/haproxy.j2 +++ b/fe-test-common/overlay/opt/frontend/config/proxytest/haproxy.j2 @@ -6,7 +6,6 @@ frontend {{ site_name }} {{ bind_ip_tls(bind_ips, 443, tls_certificate_bundle) }} - stats enable timeout http-request 10s timeout http-keep-alive 4s option forwardfor diff --git a/fe-test-common/overlay/opt/frontend/config/testtest/haproxy.j2 b/fe-test-common/overlay/opt/frontend/config/testtest/haproxy.j2 index f40cf5ce..89ca166b 100644 --- a/fe-test-common/overlay/opt/frontend/config/testtest/haproxy.j2 +++ b/fe-test-common/overlay/opt/frontend/config/testtest/haproxy.j2 @@ -6,7 +6,6 @@ frontend {{ site_name }} {{ bind_ip_tls(bind_ips, 443, tls_certificate_bundle) }} - stats enable timeout http-request 10s timeout http-keep-alive 4s option forwardfor diff --git a/fe-test-common/overlay/opt/frontend/config/validatortst/haproxy.j2 b/fe-test-common/overlay/opt/frontend/config/validatortst/haproxy.j2 index f3c3826a..4e077c03 100644 --- a/fe-test-common/overlay/opt/frontend/config/validatortst/haproxy.j2 +++ b/fe-test-common/overlay/opt/frontend/config/validatortst/haproxy.j2 @@ -6,7 +6,6 @@ frontend {{ site_name }} {{ bind_ip_tls(bind_ips, 443, tls_certificate_bundle) }} - stats enable timeout http-request 10s timeout http-keep-alive 4s option forwardfor