Merge branch 'main' into testing

Make it possible to configure s3 bucket
2024-04-29 16:25:47 +02:00 · 2024-04-29 16:25:22 +02:00
1 changed files with 2 additions and 1 deletions
--- a/manifests/multinode.pp
+++ b/manifests/multinode.pp
@ -230,7 +230,8 @@ MACAddressPolicy=none'
      $site_name = "${customer}.drive.sunet.se"
      $trusted_proxies = ['lb1.drive.sunet.se','lb2.drive.sunet.se', 'lb3.drive.sunet.se', 'lb4.drive.sunet.se']
    } else {
-      $s3_bucket = "primary-${customer}-${environment}.sunet.se"
+
+      $s3_bucket = pick($customer_config["primary_bucket"],"primary-${customer}-${environment}.sunet.se"]})
      $site_name = "${customer}.drive.${environment}.sunet.se"
      $trusted_proxies = ["lb1.drive.${environment}.sunet.se","lb2.drive.${environment}.sunet.se",
      "lb3.drive.${environment}.sunet.se","lb4.drive.${environment}.sunet.se"]
Author	SHA1	Message	Date
Micke Nordin	df4fe9985b	Merge branch 'main' into testing	2024-04-29 16:25:47 +02:00
Micke Nordin	d13b22e3a2	Make it possible to configure s3 bucket	2024-04-29 16:25:22 +02:00