From d4adbbaa463469fe070e24a793bcda081f26388c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=ABl=20Cuissinat?= <joel.cuissinat@ac-dijon.fr>
Date: Fri, 2 Sep 2016 12:34:11 +0200
Subject: [PATCH] =?UTF-8?q?Mise=20=C3=A0=20niveau=20CreoleLint=20pour=2029?=
 =?UTF-8?q?=5Fone-master.xml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ref: #16780 @20m
---
 dicos/29_one-master.xml | 82 ++++++++++++++++++++---------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/dicos/29_one-master.xml b/dicos/29_one-master.xml
index 11567a9..c6e6aa0 100644
--- a/dicos/29_one-master.xml
+++ b/dicos/29_one-master.xml
@@ -8,11 +8,11 @@
         <service>opennebula</service>
 
         <service_access service='one-ssh'>
-          <tcpwrapper>sshd</tcpwrapper>
+            <tcpwrapper>sshd</tcpwrapper>
         </service_access>
 
         <service_restriction service='one-ssh'>
-          <ip interface='eth0' ip_type='SymLinkOption'>adresse_ip_eth0</ip>
+            <ip interface='eth0' ip_type='SymLinkOption'>adresse_ip_eth0</ip>
         </service_restriction>
     </files>
     <variables>
@@ -64,43 +64,43 @@
             <variable name='one_nodes' type='string' description='Noeud voisin du Cluster' multi='True'/>
             <variable name='node_ip' type='ip' description='Adresse IP du noeud' multi='True'/>
             <variable name='activer_hooks' type='oui/non' description="Utiliser des hook personnalisés" mode='expert'>
-              <value>non</value>
+                <value>non</value>
             </variable>
             <variable name='hapy_init_master' type='oui/non' description="Pré-paramétrer Hapy">
-              <value>non</value>
+                <value>non</value>
             </variable>
             <variable name='hapy_init_master_disk_size' type='number' description="Taille en Giga-octets du disque dur vierge">
-              <value>40</value>
+                <value>40</value>
             </variable>
             <variable name='hapy_init_master_iso_version' type='string' description="Version de l'image ISO EOLE à télécharger">
-              <value>2.5.2</value>
+                <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>
-          </variable>
-          <variable name='hapy_vm_hook' type='string' description="Nom du hook de VM" multi='True' mode='expert'/>
-          <variable name='hapy_vm_hook_on' type='string' description="Déclencheur (on)" mode='expert'/>
-          <variable name='hapy_vm_hook_command' type='string' description="Script à déclencher (command)" mode='expert'/>
-          <variable name='hapy_vm_hook_arguments' type='string' description="Arguments à passer au script (arguments)" mode='expert'/>
-          <variable name='hapy_vm_hook_remote' type='oui/non' description="Exécuter sur les nœuds (remote)" mode='expert'>
-             <value>non</value>
-          </variable>
-          <variable name='hapy_vm_hook_state' type='string' description="État attendu en déclencheur 'custom' (STATE)" mode='expert'/>
-          <variable name='hapy_vm_hook_lcm_state' type='string' description="État 'lcm' attendu en déclencheur 'custom' (LCM_STATE)" mode='expert'/>
+            <variable name='hapy_vm_hooks' type='oui/non' description="Hooks sur les VM" mode='expert' mandatory='True'>
+                 <value>non</value>
+            </variable>
+            <variable name='hapy_vm_hook' type='string' description="Nom du hook de VM" multi='True' mode='expert'/>
+            <variable name='hapy_vm_hook_on' type='string' description="Déclencheur (on)" mode='expert'/>
+            <variable name='hapy_vm_hook_command' type='string' description="Script à déclencher (command)" mode='expert'/>
+            <variable name='hapy_vm_hook_arguments' type='string' description="Arguments à passer au script (arguments)" mode='expert'/>
+            <variable name='hapy_vm_hook_remote' type='oui/non' description="Exécuter sur les nœuds (remote)" mode='expert'>
+                 <value>non</value>
+            </variable>
+            <variable name='hapy_vm_hook_state' type='string' description="État attendu en déclencheur 'custom' (STATE)" mode='expert'/>
+            <variable name='hapy_vm_hook_lcm_state' type='string' description="État 'lcm' attendu en déclencheur 'custom' (LCM_STATE)" mode='expert'/>
 
-          <variable name='hapy_user_hooks' type='oui/non' description="Hooks sur les utilisateurs" mode='expert' mandatory='True'>
-             <value>non</value>
-          </variable>
-          <variable name='hapy_user_hook' type='string' description="Nom du hook d' utilisateur" multi='True' mode='expert'/>
-          <variable name='hapy_user_hook_on' type='string' description="Déclencheur (on)" mode='expert' mandatory='True'/>
-          <variable name='hapy_user_hook_command' type='string' description="Script à déclencher (command)" mode='expert' mandatory='True'/>
-          <variable name='hapy_user_hook_arguments' type='string' description="Arguments à passer au script (arguments)" mode='expert'/>
+            <variable name='hapy_user_hooks' type='oui/non' description="Hooks sur les utilisateurs" mode='expert' mandatory='True'>
+                 <value>non</value>
+            </variable>
+            <variable name='hapy_user_hook' type='string' description="Nom du hook d' utilisateur" multi='True' mode='expert'/>
+            <variable name='hapy_user_hook_on' type='string' description="Déclencheur (on)" mode='expert' mandatory='True'/>
+            <variable name='hapy_user_hook_command' type='string' description="Script à déclencher (command)" mode='expert' mandatory='True'/>
+            <variable name='hapy_user_hook_arguments' type='string' description="Arguments à passer au script (arguments)" mode='expert'/>
         </family>
+        <separators>
+            <separator name='activer_onesinglenode'>Configuration du pilote (Master)</separator>
+        </separators>
     </variables>
 
     <constraints>
@@ -203,7 +203,7 @@
         </condition>
 
         <check name="valid_enum" target="hapy_vm_hook_on">
-          <param>['CREATE','RUNNING','SHUTDOWN','STOP','DONE','UNKNOWN','FAILED','CUSTOM']</param>
+            <param>['CREATE','RUNNING','SHUTDOWN','STOP','DONE','UNKNOWN','FAILED','CUSTOM']</param>
         </check>
 
         <condition name='disabled_if_in' source='hapy_vm_hooks'>
@@ -211,16 +211,16 @@
             <target type='variable'>hapy_vm_hook</target>
         </condition>
         <group master='hapy_vm_hook'>
-          <slave>hapy_vm_hook_on</slave>
-          <slave>hapy_vm_hook_command</slave>
-          <slave>hapy_vm_hook_arguments</slave>
-          <slave>hapy_vm_hook_remote</slave>
-          <slave>hapy_vm_hook_state</slave>
-          <slave>hapy_vm_hook_lcm_state</slave>
+            <slave>hapy_vm_hook_on</slave>
+            <slave>hapy_vm_hook_command</slave>
+            <slave>hapy_vm_hook_arguments</slave>
+            <slave>hapy_vm_hook_remote</slave>
+            <slave>hapy_vm_hook_state</slave>
+            <slave>hapy_vm_hook_lcm_state</slave>
         </group>
 
         <check name="valid_enum" target="hapy_user_hook_on">
-          <param>['CREATE','REMOVE']</param>
+            <param>['CREATE','REMOVE']</param>
         </check>
 
         <condition name='disabled_if_in' source='hapy_user_hooks'>
@@ -228,11 +228,11 @@
             <target type='variable'>hapy_user_hook</target>
         </condition>
         <group master='hapy_user_hook'>
-          <slave>hapy_user_hook_on</slave>
-          <slave>hapy_user_hook_command</slave>
-          <slave>hapy_user_hook_arguments</slave>
+            <slave>hapy_user_hook_on</slave>
+            <slave>hapy_user_hook_command</slave>
+            <slave>hapy_user_hook_arguments</slave>
         </group>
-        <condition name='hidden_if_in' source='hapy_init_master'>
+        <condition name='disabled_if_in' source='hapy_init_master'>
             <param>non</param>
             <target type='variable'>hapy_init_master_disk_size</target>
             <target type='variable'>hapy_init_master_iso_version</target>
@@ -254,7 +254,7 @@
         <variable name='hapy_user_hook_on'>Déclancheur du Hook (cf: http://docs.opennebula.org/4.8/integration/infrastructure_integration/hooks.html)</variable>
         <variable name='hapy_user_hook_command'>Script lancé par le Hook (cf: http://docs.opennebula.org/4.8/integration/infrastructure_integration/hooks.html)</variable>
         <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'>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>