Commit 83bcd1d6 authored by Albin PETIT's avatar Albin PETIT

[generators/puppet] update kadeployg5k.conf.erb to remove preinstall for new clusters

parent 21f0ec5c
Pipeline #82243 passed with stages
in 1 minute and 51 seconds
......@@ -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")
......
......@@ -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 |-
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment