From e032de1c693c21ff958a2f56f1eb8793893d55bb Mon Sep 17 00:00:00 2001
From: Daniel STAN <daniel.stan@crans.org>
Date: Mon, 24 Feb 2014 00:34:56 +0100
Subject: [PATCH] =?UTF-8?q?dhcp,=20asterisk:=20passage=20=C3=A0=20pve?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cfg/etc/xen/asterisk/asterisk | 13 -------------
 Cfg/etc/xen/dhcp/dhcp         | 18 ------------------
 Metadata/groups.xml           |  4 ++--
 3 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 Cfg/etc/xen/asterisk/asterisk
 delete mode 100644 Cfg/etc/xen/dhcp/dhcp

diff --git a/Cfg/etc/xen/asterisk/asterisk b/Cfg/etc/xen/asterisk/asterisk
deleted file mode 100644
index 203ea1d..0000000
--- a/Cfg/etc/xen/asterisk/asterisk
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8; mode: python -*-
-
-execfile("/etc/xen/common_wheezy.py")
-
-name = "asterisk"
-
-memory = 512
-
-vif = [ pub('00:00:13:03:09:0c'),
-        adm('00:00:13:03:09:0d')  ]
-
-disk = [ vol("asterisk", "slash", "xvda"),
-         vol("asterisk", "swap", "xvdb") ]
diff --git a/Cfg/etc/xen/dhcp/dhcp b/Cfg/etc/xen/dhcp/dhcp
deleted file mode 100644
index ab91a9a..0000000
--- a/Cfg/etc/xen/dhcp/dhcp
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- coding: utf-8; mode: python -*-
-
-execfile("/etc/xen/common_wheezy.py")
-
-name = "dhcp"
-memory = 512
-
-disk = [ vol(name, "slash", "xvda"),
-         vol(name, "swap", "xvdb") ]
-
-vif = [ pub('02:64:68:63:70:01'),
-        adm('02:64:68:63:70:02'),
-	wifi('02:64:68:63:70:03'),
-	gratuit('02:64:68:63:70:06'),
-	accueil('02:64:68:63:70:07'),
-	isolement('02:64:68:63:70:09'),
-	appt_ens('02:64:68:63:70:21')
- ]
diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index d334245..194ba7e 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -316,7 +316,7 @@
 
   <Group name="asterisk"
          profile="true">
-    <Group name="crans-domu-wheezy"/>
+    <Group name="crans-vm-wheezy"/>
     <Bundle name="check_cert"/>
     <Group name="asterisk-server"/>
     <Group name="ident-daemon"/>
@@ -434,7 +434,7 @@
 
   <Group name="dhcp"
         profile="true">
-    <Group name="crans-domu-wheezy"/>
+    <Group name="crans-vm-wheezy"/>
     <Group name="vlan-radin"/>
     <Group name="vlan-accueil"/>
     <Group name="vlan-isolement"/>