From d5a8461e01fe69b6d6d8771184c2f806c0d8bb22 Mon Sep 17 00:00:00 2001
From: Dimitri DELABROYE <dimitri.delabroye@inria.fr>
Date: Tue, 26 May 2020 10:57:44 +0200
Subject: [PATCH] [refrepo/gen/puppet] add deploy.default_params on kadeploy
conf
---
lib/refrepo/gen/puppet/templates/kadeployg5k.conf.erb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/refrepo/gen/puppet/templates/kadeployg5k.conf.erb b/lib/refrepo/gen/puppet/templates/kadeployg5k.conf.erb
index 5390da9baf..f823ab2843 100644
--- a/lib/refrepo/gen/puppet/templates/kadeployg5k.conf.erb
+++ b/lib/refrepo/gen/puppet/templates/kadeployg5k.conf.erb
@@ -55,7 +55,7 @@ initrd_dev = 'kernels/kadeploy3-deploy-kernel-jessie.initrd.img'%>
suffix == '' ? kernel_prod : kernel_dev %>
initrd: <%= data['deploy.initrd'] ? data['deploy.initrd'] :
suffix == '' ? initrd_prod : initrd_dev %>
- params: <%= data['deploy.params'] %>
+ params: <%= data['deploy.params'] %><%= data['deploy.default_params'] ? ' ' + data['deploy.default_params'] : '' %>
supported_fs: ext2, ext3, ext4<%
if !data['nfsroot.params'].nil? %>
nfsroot:
--
GitLab