[generators/puppet] update kadeployg5k.conf.erb to remove preinstall …

…for new clusters
grid5000 · Jun 11, 2019 · 83bcd1d · 83bcd1d
1 parent 21f0ec5
commit 83bcd1d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/refrepo/gen/puppet/kadeployg5k.rb b/lib/refrepo/gen/puppet/kadeployg5k.rb
@@ -152,7 +152,7 @@ def generate_puppet_kadeployg5k(options)
           next
         end
 
-        output = ERB.new(File.read(File.expand_path('templates/kadeployg5k.conf.erb', File.dirname(__FILE__)))).result(binding)
+        output = ERB.new(File.read(File.expand_path('templates/kadeployg5k.conf.erb', File.dirname(__FILE__))), nil, '-').result(binding)
 
         output_file = Pathname("#{options[:output_dir]}//platforms/production/modules/generated/files/grid5000/kadeploy/server#{suffix.tr('-', '_')}/#{site_uid}/#{cluster_uid}-cluster.conf")
 

diff --git a/lib/refrepo/gen/puppet/templates/kadeployg5k.conf.erb b/lib/refrepo/gen/puppet/templates/kadeployg5k.conf.erb
@@ -63,11 +63,13 @@ initrd_dev  = 'kernels/kadeploy3-deploy-kernel-jessie.initrd.img'%>
       vmlinuz: kernels/deploy-vmlinuz-2.6.31.4-nfsroot<% end %>
     user:
       params: <%= data['user.params'] %>
+<%- if ! data['preinstall'].nil? && data['preinstall'].to_s == "true" -%>
 postinstall:
   files:
   - script: none
     format: tgz
     file:  /grid5000/preinstalls/preinstall-<%= cluster_uid %>.tgz
+<%- end -%>
 pxe:
   headers:
     dhcp: &id001 |-