From 22f55c3bc90cbb0f9c4079e0efc936c5a43d573f Mon Sep 17 00:00:00 2001
From: Alexandre MERLIN <alexandre.merlin@inria.fr>
Date: Mon, 5 Jul 2021 13:18:26 +0200
Subject: [PATCH] [gen/kadeploy] adapt cluster configuration to kadeploy3.6
---
.../gen/puppet/templates/kadeployg5k.conf.erb | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/refrepo/gen/puppet/templates/kadeployg5k.conf.erb b/lib/refrepo/gen/puppet/templates/kadeployg5k.conf.erb
index dc740978055..2b7f9ef0190 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:
--
GitLab