From d33f80273de74117d2165cf7955e7d3deebd7964 Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Mon, 29 Apr 2024 16:29:50 +0200 Subject: [PATCH 1/2] Fix syntax --- manifests/multinode.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/multinode.pp b/manifests/multinode.pp index 024d3b0..0486b70 100644 --- a/manifests/multinode.pp +++ b/manifests/multinode.pp @@ -231,7 +231,7 @@ MACAddressPolicy=none' $trusted_proxies = ['lb1.drive.sunet.se','lb2.drive.sunet.se', 'lb3.drive.sunet.se', 'lb4.drive.sunet.se'] } else { - $s3_bucket = pick($customer_config["primary_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"] From bd074c73d509b11b4f743deea75197a6eb2079bf Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Mon, 29 Apr 2024 16:34:38 +0200 Subject: [PATCH 2/2] Fix syntax --- manifests/multinode.pp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/manifests/multinode.pp b/manifests/multinode.pp index 0486b70..c3e2614 100644 --- a/manifests/multinode.pp +++ b/manifests/multinode.pp @@ -231,7 +231,11 @@ MACAddressPolicy=none' $trusted_proxies = ['lb1.drive.sunet.se','lb2.drive.sunet.se', 'lb3.drive.sunet.se', 'lb4.drive.sunet.se'] } else { - $s3_bucket = pick($customer_config["primary_bucket"],"primary-${customer}-${environment}.sunet.se") + if "primary_bucket" in $customer_config.keys() { + $s3_bucket = $customer_config["primary_bucket"] + } else { + $s3_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"]