From 589e1deee311cb15b6b8fdcc5a0ba9e701e9f0cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue@crans.org>
Date: Mon, 22 Apr 2013 00:50:49 +0200
Subject: [PATCH] [All] Ajout de kdell + nettoyage

---
 Base/dom0.xml             |  1 -
 Base/needed.xml           |  9 ---------
 Bundler/firmware-bnx2.xml |  3 +++
 Bundler/iscsi.xml         |  4 ++++
 Metadata/clients.xml      |  9 ++-------
 Metadata/groups.xml       | 11 ++++++++++-
 6 files changed, 19 insertions(+), 18 deletions(-)
 create mode 100644 Bundler/firmware-bnx2.xml
 create mode 100644 Bundler/iscsi.xml

diff --git a/Base/dom0.xml b/Base/dom0.xml
index 9756f80..203cab2 100644
--- a/Base/dom0.xml
+++ b/Base/dom0.xml
@@ -5,7 +5,6 @@
     <Path name="/etc/xen/common_wheezy.py"/>
     <Path name="/etc/xen/bcfg2"/>
     <Path name="/etc/xen/irc"/>
-    <Path name="/etc/xen/munin"/>
     <Path name="/etc/xen/news"/>
     <Path name="/etc/xen/niomniom"/>
     <Path name="/etc/xen/o2"/>
diff --git a/Base/needed.xml b/Base/needed.xml
index b93d51e..5edc374 100644
--- a/Base/needed.xml
+++ b/Base/needed.xml
@@ -53,15 +53,6 @@
     <Python name="/etc/sysctl.conf"/>
   </Group>
 
-  <Group name="iscsi">
-    <Package name="open-iscsi"/>
-    <Path name="/etc/udev/rules.d/10_crans_iscsi.rules"/>
-  </Group>
-
-  <Group name="firmware-bnx2">
-    <Package name="firmware-bnx2"/>
-  </Group>
-
   <Group name="domu">
     <Group name="wheezy">
       <Package name="linux-image-amd64"/>
diff --git a/Bundler/firmware-bnx2.xml b/Bundler/firmware-bnx2.xml
new file mode 100644
index 0000000..82c3677
--- /dev/null
+++ b/Bundler/firmware-bnx2.xml
@@ -0,0 +1,3 @@
+<Bundle name="firmware-bnx2">
+  <Package name="firmware-bnx2"/>
+</Bundle>
diff --git a/Bundler/iscsi.xml b/Bundler/iscsi.xml
new file mode 100644
index 0000000..d93e310
--- /dev/null
+++ b/Bundler/iscsi.xml
@@ -0,0 +1,4 @@
+<Bundle name="iscsi" version="2">
+  <Package name="open-iscsi"/>
+  <Path name="/etc/udev/rules.d/10_crans_iscsi.rules"/>
+</Bundle>
diff --git a/Metadata/clients.xml b/Metadata/clients.xml
index 8a9343c..cc479f7 100644
--- a/Metadata/clients.xml
+++ b/Metadata/clients.xml
@@ -3,7 +3,6 @@
   <!-- Serveurs -->
   <Client name="komaz.adm.crans.org" profile="komaz" pingable="Y" pingtime="1342471851.09"/>
   <Client name="charybde.adm.crans.org" profile="charybde" pingable="Y" pingtime="1342471851.09"/>
-  <Client name="daath.adm.crans.org" profile="daath" pingable="Y" pingtime="1342471851.09"/>
   <Client name="sable.adm.crans.org" profile="sable" pingable="Y" pingtime="1342471851.09"/>
   <Client name="zamok.adm.crans.org" profile="zamok" pingable="Y" pingtime="1342471851.09"/>
   <Client name="vert.adm.crans.org" profile="vert" pingable="Y" pingtime="1342471851.09"/>
@@ -13,7 +12,9 @@
   <Client name="gordon.adm.crans.org" profile="gordon" pingable="Y" pingtime="1342471851.08"/>
   <Client name="malloc.adm.crans.org" profile="malloc" pingable="Y" pingtime="1342471851.07"/>
   <Client name="dyson.adm.crans.org" profile="dyson" pingable="Y" pingtime="1342471851.07"/>
+  <Client name="thot.adm.crans.org" profile="thot" pingable="Y"/>
   <Client name="zbee.adm.crans.org" profile="zbee" pingable="Y"/>
+  <Client name="kdell.adm.crans.org" profile="kdell" pingable="Y"/>
 
   <!-- dom0 -->
   <Client name="fy.adm.crans.org" profile="fy" pingable="Y" pingtime="1342471851.06"/>
@@ -25,14 +26,12 @@
   <Client name="xmpp.adm.crans.org" profile="xmpp" pingable="Y" pingtime="1342471851.04"/>
   <Client name="o2.adm.crans.org" profile="o2" pingable="Y" pingtime="1342471851.03"/>
   <Client name="news.adm.crans.org" profile="news" pingable="Y" pingtime="1342471851.02"/>
-  <Client name="munin.adm.crans.org" profile="munin" pingable="Y" pingtime="1342471851.02"/>
   <Client name="niomniom.adm.crans.org" profile="niomniom" pingable="Y" pingtime="1342471851.01"/>
   <Client name="ytrap-llatsni.adm.crans.org" profile="install-party" pingable="Y" pingtime="1342471851.01"/>
   <Client name="radius.adm.crans.org" profile="radius" pingable="Y" pingtime="1342471851.0"/>
   <Client name="owl.adm.crans.org" profile="owl" pingable="Y" pingtime="1342471850.99"/>
   <Client name="asterisk.adm.crans.org" profile="asterisk" pingable="Y" pingtime="1342471850.99"/>
   <Client name="tracker.adm.crans.org" profile="tracker" pingable="Y" pingtime="1342471850.98"/>
-  <Client name="pgsql.adm.crans.org" profile="pgsql" pingable="Y" pingtime="1342471850.97"/>
   <Client name="redisdead.adm.crans.org" profile="redisdead" pingable="Y" pingtime="1342471850.97"/>
   <Client name="bcfg2.adm.crans.org" profile="bcfg2" pingable="Y" pingtime="1342471850.96"/>
   <Client name="kenobi.adm.crans.org" profile="kenobi" pingable="Y" pingtime="1342471850.95"/>
@@ -40,15 +39,11 @@
   <Client name="dhcp.adm.crans.org" profile="dhcp"/>
   <Client name="routeur.adm.crans.org" profile="routeur"/>
   <Client name="puppet.adm.crans.org" profile="puppet" pingable="Y"/>
-  <Client name="thot.adm.crans.org" profile="thot" pingable="Y"/>
   <Client name="eap.adm.crans.org" profile="eap" pingable="Y"/>
   <Client name="nat64.adm.crans.org" profile="nat64" pingable="Y"/>
   <Client name="cas.adm.crans.org" profile="cas" pingable="Y"/>
   <Client name="schrodingred.adm.crans.org" profile="schrodingred" pingable="Y"/>
 
-  <!-- Containers OpenVZ -->
-  <Client name="notyetbroken.adm.crans.org" profile="notyetbroken" pingable="N" pingtime="1252769390.14"/>
-
   <!-- La ferme -->
   <Client name="canard.adm.crans.org" profile="canard" pingable="Y" pingtime="1342471850.94"/>
   <Client name="oie.adm.crans.org" profile="oie" pingable="Y" pingtime="1342471850.93"/>
diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index 5ea1bb5..16e433d 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -40,6 +40,7 @@
 
   <Group name="kdell" profile="true">
     <Group name="crans-wheezy"/>
+    <Group name="iscsi"/>
   </Group>
 
   <Group name="sable"
@@ -400,6 +401,7 @@
     <Bundle name="secrets"/>
     <Bundle name="nfs-client"/>
     <Bundle name="git"/>
+    <Bundle name="monit"/>
   </Group>
 
   <Group name="crans-common"
@@ -425,7 +427,6 @@
     <Bundle name="apt-keys"/>
     <Bundle name="firewall6"/>
     <Bundle name="logcheck"/>
-    <Bundle name="monit"/>
     <Bundle name="scripts"/>
     <Bundle name="molly-guard"/>
     <Bundle name="vlock"/>
@@ -1122,6 +1123,10 @@
   <!-- | Les backends | -->
   <!-- +==============+ -->
 
+  <Group name="iscsi" comment="Backend iscsi">
+    <Bundle name="iscsi"/>
+  </Group>
+
   <Group name="pam"
     comment="authentification par pam"
     category="auth-backend">
@@ -1312,6 +1317,10 @@
    <Group name="arpwatch" />
  </Group>
 
+ <Group name="firmware-bnx2">
+   <Bundle name="firmware-bnx2"/> 
+ </Group>
+
 
 <Group name="arpwatch" comment="arpwatch special crans avec traçage des macs">
     <Group name="non-free" /><!-- Pour snmp-mibs-downloader, pour interrogation switch -->