From d68c3776fee61329f665ede740cca51946395d1c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20B=C3=A9rtoli?= Date: Mon, 18 Oct 2021 19:47:27 -0300 Subject: [PATCH] 17742: update script addressing review suggestions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Arvados-DCO-1.1-Signed-off-by: Javier Bértoli --- .../single_host/multiple_hostnames/pillars/arvados.sls | 2 +- .../single_host/single_hostname/pillars/arvados.sls | 2 +- tools/salt-install/provision.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/arvados.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/arvados.sls index 5a1a0f4751..81d324fcbd 100644 --- a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/arvados.sls +++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/arvados.sls @@ -83,7 +83,7 @@ arvados: tls: # certificate: '' # key: '' - # required to test with arvados-snakeoil certs + # When using arvados-snakeoil certs set insecure: true insecure: false resources: diff --git a/tools/salt-install/config_examples/single_host/single_hostname/pillars/arvados.sls b/tools/salt-install/config_examples/single_host/single_hostname/pillars/arvados.sls index a45ac8d811..78a5a938f3 100644 --- a/tools/salt-install/config_examples/single_host/single_hostname/pillars/arvados.sls +++ b/tools/salt-install/config_examples/single_host/single_hostname/pillars/arvados.sls @@ -72,7 +72,7 @@ arvados: tls: # certificate: '' # key: '' - # required to test with arvados-snakeoil certs + # When using arvados-snakeoil certs set insecure: true insecure: true ### TOKENS diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh index 310e094997..537f087b62 100755 --- a/tools/salt-install/provision.sh +++ b/tools/salt-install/provision.sh @@ -641,7 +641,7 @@ else fi else grep -q ${R} ${P_DIR}/extra_custom_certs.sls || echo " - ${R}" >> ${P_DIR}/extra_custom_certs.sls - + # As the pillar differ whether we use LE or custom certs, we need to do a final edition on them # Special case for keepweb if [ ${R} = "keepweb" ]; then -- 2.30.2