From 8aff9369ae174fb31bb46c8945a40635293a5cf7 Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <baptiste.jonglez@imag.fr>
Date: Fri, 30 Oct 2020 20:02:04 +0100
Subject: [PATCH] [input] [drac] Remove other duplicate keys: network, disk

---
 .../sites/grenoble/clusters/drac/drac.yaml    |  3 --
 .../grenoble/clusters/drac/drac_ip.yaml.erb   | 54 -------------------
 2 files changed, 57 deletions(-)
 delete mode 100644 input/grid5000/sites/grenoble/clusters/drac/drac_ip.yaml.erb

diff --git a/input/grid5000/sites/grenoble/clusters/drac/drac.yaml b/input/grid5000/sites/grenoble/clusters/drac/drac.yaml
index 18b75dfc5d..5fb81b9194 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/drac.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/drac.yaml
@@ -20,7 +20,6 @@ nodes:
     network_adapters:
       bmc:
         interface: Ethernet
-        management: true
         enabled: true
         mountable: false
         mounted: false
@@ -55,8 +54,6 @@ nodes:
       sda:
         interface: SATA
         storage: HDD
-        model: unknown
       sdb:
         interface: SATA
         storage: HDD
-        model: unknown
diff --git a/input/grid5000/sites/grenoble/clusters/drac/drac_ip.yaml.erb b/input/grid5000/sites/grenoble/clusters/drac/drac_ip.yaml.erb
deleted file mode 100644
index 26221ef565..0000000000
--- a/input/grid5000/sites/grenoble/clusters/drac/drac_ip.yaml.erb
+++ /dev/null
@@ -1,54 +0,0 @@
-nodes:
-<% (1..12).each { |i| %>
-  drac-<%= i %>:
-    network_adapters:
-      eth1:
-        mounted: false
-        mac: <%= %w(
-                    98:be:94:68:1e:55
-                    98:be:94:68:72:35
-                    98:be:94:68:72:65
-                    98:be:94:68:72:55
-                    98:be:94:68:48:cd
-                    98:be:94:68:7a:51
-                    98:be:94:68:80:15
-                    98:be:94:68:7b:91
-                    98:be:94:68:75:c1
-                    98:be:94:68:7a:45
-                    98:be:94:68:46:55
-                    98:be:94:68:7a:15
-                   )[i-1] %>
-      eth3:
-        mounted: true
-        ip: 172.16.24.<%= i %>
-        mac: <%= %w(
-                    98:be:94:68:1e:57
-                    98:be:94:68:72:37
-                    98:be:94:68:72:67
-                    98:be:94:68:72:57
-                    98:be:94:68:48:cf
-                    98:be:94:68:7a:53
-                    98:be:94:68:80:17
-                    98:be:94:68:7b:93
-                    98:be:94:68:75:c3
-                    98:be:94:68:7a:47
-                    98:be:94:68:46:57
-                    98:be:94:68:7a:17
-                   )[i-1] %>
-      bmc:
-        ip: 172.17.24.<%= i %>
-        mac: <%= %w(
-                    70:e2:84:14:15:6d
-                    70:e2:84:14:11:35
-                    70:e2:84:14:15:79
-                    70:e2:84:14:14:77
-                    70:e2:84:14:14:17
-                    70:e2:84:14:14:e6
-                    70:e2:84:14:15:a9
-                    70:e2:84:14:14:05
-                    70:e2:84:14:11:47
-                    70:e2:84:14:14:74
-                    70:e2:84:14:14:b6
-                    70:e2:84:14:11:d1
-                  )[i-1] %>
-<% } %>
-- 
GitLab