From 5adaf1d3d1c6d591e9c55b33654d537f0422303d Mon Sep 17 00:00:00 2001
From: Vincent Le Gallic <legallic@crans.org>
Date: Fri, 29 Nov 2013 02:41:54 +0100
Subject: [PATCH] [xen] Migration de vert et o2 sous proxmox

---
 Base/dom0.xml         |  2 --
 Base/utils.xml        |  5 -----
 Cfg/etc/xen/ldap/ldap | 13 -------------
 Cfg/etc/xen/o2/o2     | 11 -----------
 Metadata/groups.xml   |  9 +++++++--
 5 files changed, 7 insertions(+), 33 deletions(-)
 delete mode 100644 Cfg/etc/xen/ldap/ldap
 delete mode 100644 Cfg/etc/xen/o2/o2

diff --git a/Base/dom0.xml b/Base/dom0.xml
index acd2cde..93ae61e 100644
--- a/Base/dom0.xml
+++ b/Base/dom0.xml
@@ -5,14 +5,12 @@
     <Path name="/etc/xen/common_wheezy.py"/>
     <Path name="/etc/xen/news"/>
     <Path name="/etc/xen/niomniom"/>
-    <Path name="/etc/xen/o2"/>
     <Path name="/etc/xen/titanic"/>
     <Path name="/etc/xen/xmpp"/>
     <Path name="/etc/xen/ytrap-llatsni"/>
     <Path name="/etc/xen/owl"/>
     <Path name="/etc/xen/asterisk"/>
     <Path name="/etc/xen/radius"/>
-    <Path name="/etc/xen/ldap"/>
     <Path name="/etc/xen/redisdead"/>
     <Path name="/etc/xen/sogo"/>
     <Path name="/etc/xen/dhcp"/>
diff --git a/Base/utils.xml b/Base/utils.xml
index 1be78bf..02bb094 100644
--- a/Base/utils.xml
+++ b/Base/utils.xml
@@ -13,11 +13,6 @@
     <Package name="fping"/>
     <Package name="htop"/>
     <Package name="ipython"/>
-    <Group name="domu" negate="true">
-        <Group name="dom0" negate="true">
-            <Package name="kexec-tools"/>
-        </Group>
-    </Group>
     <Package name="less"/>
     <Package name="procinfo"/>
     <Package name="tree"/>
diff --git a/Cfg/etc/xen/ldap/ldap b/Cfg/etc/xen/ldap/ldap
deleted file mode 100644
index 44bef1e..0000000
--- a/Cfg/etc/xen/ldap/ldap
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8; mode: python -*-
-
-execfile("/etc/xen/common_wheezy.py")
-
-name = "ldap"
-
-memory = 512
-
-vif = [ adm('00:00:13:04:09:01') ]
-
-disk = [ vol(name, "slash", "xvda"),
-         vol(name, "var", "xvdb"),
-         vol(name, "swap", "xvdc") ]
diff --git a/Cfg/etc/xen/o2/o2 b/Cfg/etc/xen/o2/o2
deleted file mode 100644
index cf388e2..0000000
--- a/Cfg/etc/xen/o2/o2
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- coding: utf-8; mode: python -*-
-
-execfile("/etc/xen/common_wheezy.py")
-
-name = "o2"
-
-disk = [ vol(name, "slash", "xvda"),
-         vol(name, "swap", "xvdb") ]
-
-vif = [ pub("00:00:6c:69:69:21"),
-        adm("00:00:6c:69:69:71") ]
diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index 1526740..62f8fda 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -52,6 +52,11 @@
     <Group name="ident-daemon"/> <!-- pgsql speedup (webmail) -->
   </Group>
 
+  <Group name="mediadrop"
+     profile="true">
+    <Group name="crans-vm-wheezy"/>
+  </Group>
+
   <Group name="horde"
      profile="true">
     <Group name="crans-vm-wheezy"/>
@@ -159,7 +164,7 @@
     <Group name="db-main"/>
 <!-- <Group name="ups-server"/> -->
     <Group name="non-vlan-adherent"/>
-    <Group name="crans-domu-wheezy"/>
+    <Group name="crans-vm-wheezy"/>
   </Group>
 
   <Group name="babar"
@@ -360,7 +365,7 @@
 
   <Group name="o2"
          profile="true">
-    <Group name="crans-domu-wheezy"/>
+    <Group name="crans-vm-wheezy"/>
     <Group name="intranet2-server"/>
     <Group name="https_cert"/>
   </Group>