From 9854787f034377e7768fc7ef2609b1b3931ada70 Mon Sep 17 00:00:00 2001
From: Alexandre MERLIN <alexandre.merlin@inria.fr>
Date: Tue, 2 Nov 2021 12:44:23 +0100
Subject: [PATCH] [lib/gen/kadeploy] Do not set trusted deployment env in
cluster conf if no env is trusted
---
lib/refrepo/gen/puppet/templates/kadeployg5k.conf.erb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lib/refrepo/gen/puppet/templates/kadeployg5k.conf.erb b/lib/refrepo/gen/puppet/templates/kadeployg5k.conf.erb
index f33e8e50294..519e9aa36df 100644
--- a/lib/refrepo/gen/puppet/templates/kadeployg5k.conf.erb
+++ b/lib/refrepo/gen/puppet/templates/kadeployg5k.conf.erb
@@ -98,9 +98,11 @@ pxe:
automata:
macrosteps:
SetDeploymentEnv:
+<%- if data['trusted_env'] -%>
- timeout: <%= data['deployment.timeout'] %>
type: Trusted
retries: <%= data['deployment.retries'].nil? ? 1 : data['deployment.retries'] %>
+<%- end -%>
- timeout: <%= data['deployment.timeout'] %>
type: Untrusted
retries: <%= data['deployment.retries'].nil? ? 1 : data['deployment.retries'] %>
--
GitLab