From e9889cf0bcb5869da86038082a4fe5434bcd40ce Mon Sep 17 00:00:00 2001
From: Klaas TJEBBES <klaas.tjebbes@ac-dijon.fr>
Date: Wed, 27 Apr 2016 17:21:25 +0200
Subject: [PATCH] =?UTF-8?q?99=5Fone-master.xml=20:=20ajout=20d'une=20liste?=
 =?UTF-8?q?=20pour=20choisir=20le=20pilote=20r=C3=A9seau=20et=20ajout=20de?=
 =?UTF-8?q?=20<help>=20pour=20vnets=20et=20l2=5Fvnets?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dicos/99_one-master.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/dicos/99_one-master.xml b/dicos/99_one-master.xml
index 4a50266..475e444 100644
--- a/dicos/99_one-master.xml
+++ b/dicos/99_one-master.xml
@@ -23,6 +23,7 @@
             <variable name='activer_onesinglenode' type='oui/non' description="Activer le serveur de virtualisation" mode='expert'>
                 <value>oui</value>
             </variable>
+            <variable name='vnet_pilote' type='string'  description='Pilote réseau' hidden='True' />
             <variable name='one_cluster_name' type='string' description="Nom de la grappe OpenNebula" mode='expert' auto_freeze='True' mandatory="True">
                 <value></value>
             </variable>
@@ -78,6 +79,9 @@
               <value>2.5.2</value>
             </variable>
         </family>
+            <separators>
+              <separator name='activer_onesinglenode'>Configuration du pilote (Master)</separator>
+            </separators>
         <family name='Hooks'>
           <variable name='hapy_vm_hooks' type='oui/non' description="Hooks sur les VM" mode='expert' mandatory='True'>
              <value>non</value>
@@ -103,6 +107,13 @@
     </variables>
 
     <constraints>
+        <check name="valid_enum" target="vnet_pilote">
+            <param>['openvswitch']</param>
+        </check>
+        <auto name='calc_multi_condition' target='activer_openvswitch'>
+            <param>openvswitch</param>
+            <param type="eole" name="condition_1">vnet_pilote</param>
+        </auto>
         <fill name='concat' target='one_cluster_name'>
           <param>CL-</param>
           <param type='eole'>numero_etab</param>
@@ -178,6 +189,7 @@
 
         <condition name='disabled_if_in' source='activer_openvswitch'>
             <param>non</param>
+            <target type='variable'>vnets</target>
             <target type='variable'>vnet_network_addr</target>
             <target type='variable'>vnet_network_dns</target>
             <target type='variable'>vnet_network_mask</target>
@@ -252,5 +264,7 @@
         <variable name='hapy_user_hook_arguments'>Arguments passés au script lancé par le  Hook d'utilisateur (cf: http://docs.opennebula.org/4.8/integration/infrastructure_integration/hooks.html)</variable>
         <variable name='hapy_init_master'>Initialiser Hâpy avec quelques fonctions de bases : ISO EOLE, Disque dur vierge et template d'installation d'EoleBase. ATTENTION, provoque le téléchargement de l'ISO EOLE</variable>
         <variable name='hapy_init_master_iso_version'>Version de l'ISO EOLE à télécharger lors de l'initialisation</variable>
+        <variable name='vnets'>Réseau de type IPv4 (niveau 3 du modèle OSI)</variable>
+        <variable name='l2_vnets'>Réseau de type ETHER (niveau 2 du modèle OSI)</variable>
     </help>
 </creole>