diff --git a/lib/refrepo/gen/puppet/templates/kadeployg5k.conf.erb b/lib/refrepo/gen/puppet/templates/kadeployg5k.conf.erb index dc740978055dca44a6360534417c9def156f1707..2b7f9ef0190774e366282b40ad007b34cc4ba5d6 100644 --- a/lib/refrepo/gen/puppet/templates/kadeployg5k.conf.erb +++ b/lib/refrepo/gen/puppet/templates/kadeployg5k.conf.erb @@ -4,18 +4,18 @@ # --- partitioning: - block_device: /dev/sda + deploy_label: DEPLOY + block_device: disk0 script: /etc/kadeploy3<%= suffix %>/<%= ! data['partitioning.script'].nil? ? data['partitioning.script'] : "partitioning.sh" %> <%- if !data['formating.script'].nil? && !data['formating.script'].empty? -%> formating_script: /etc/kadeploy3<%= suffix %>/<%= data['formating.script'] %> <%- end -%> - partitions: - tmp: 5 - prod: 2 - deploy: 3 - swap: 1 + disk_path: + <%- cluster['nodes'].values.first['storage_devices'].reject{|disk| disk['reservation']}.each do |disk| -%> + <%= disk['id'] %>: <%= disk['by_path'] %> + <%- end -%> trusted_deployment: - partition: /dev/sda<%= suffix.empty? ? "2":"3"%> + partition: disk0/PROD user: oar <% if data['trusted_env'] %> envs: