Cadoles
/
eole-one-master
20
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pouvoir supprimer tous les hooks malgré le caractère obligatoire de variables 

L'une des variables esclaves est de type 'oui/non' et est interprétée comme
obligatoire. Il faut cacher le groupe si il n'y a plus de hook actif pour
éviter les problèmes d'accès à des variables.

Ref #12701
This commit is contained in:
Benjamin Bohard 2015-09-01 17:00:05 +02:00
parent 83eda7d01b
commit 1929e5024d
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dicos/99_one-master.xml
View File

@ -70,20 +70,26 @@
</variable> </variable>
</family> </family>
<family name='Hooks'> <family name='Hooks'>
<variable name='hapy_vm_hook' type='string' description="Nom du hook de VM" multi='True' mode='expert'/> <variable name='hapy_vm_hooks' type='oui/non' description="Hooks sur les VM" mode='expert' mandatory='True'>
<variable name='hapy_vm_hook_on' type='string' description="Déclancheur (on)" mode='expert'/>
<variable name='hapy_vm_hook_command' type='string' description="Script a déclancher (command)" mode='expert'/>
<variable name='hapy_vm_hook_arguments' type='string' description="Arguments a passer au script (arguments)" mode='expert'/>
<variable name='hapy_vm_hook_remote' type='oui/non' description="Exécuter sur les noeuds (remote)" mode='expert'>
<value>non</value> <value>non</value>
</variable> </variable>
<variable name='hapy_vm_hook_state' type='string' description="Etat attendus en déclancheur 'custom' (STATE)" mode='expert'/> <variable name='hapy_vm_hook' type='string' description="Nom du hook de VM" multi='True' mode='expert'/>
<variable name='hapy_vm_hook_lcm_state' type='string' description="Etat 'lcm' attendus en déclancheur 'custom' (LCM_STATE)" 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' type='string' description="Nom du hook d' utilisateur" multi='True' mode='expert'/>
<variable name='hapy_user_hook_on' type='string' description="Déclancheur (on)" 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 a déclancher (command)" mode='expert'/> <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 a passer au script (arguments)" mode='expert'/> <variable name='hapy_user_hook_arguments' type='string' description="Arguments à passer au script (arguments)" mode='expert'/>
</family> </family>
</variables> </variables>
@ -187,6 +193,10 @@
<param>['CREATE','RUNNING','SHUTDOWN','STOP','DONE','UNKNOWN','FAILED','CUSTOM']</param> <param>['CREATE','RUNNING','SHUTDOWN','STOP','DONE','UNKNOWN','FAILED','CUSTOM']</param>
</check> </check>
<condition name='disabled_if_in' source='hapy_vm_hooks'>
<param>non</param>
<target type='variable'>hapy_vm_hook</target>
</condition>
<group master='hapy_vm_hook'> <group master='hapy_vm_hook'>
<slave>hapy_vm_hook_on</slave> <slave>hapy_vm_hook_on</slave>
<slave>hapy_vm_hook_command</slave> <slave>hapy_vm_hook_command</slave>
@ -200,6 +210,10 @@
<param>['CREATE','REMOVE']</param> <param>['CREATE','REMOVE']</param>
</check> </check>
<condition name='disabled_if_in' source='hapy_user_hooks'>
<param>non</param>
<target type='variable'>hapy_user_hook</target>
</condition>
<group master='hapy_user_hook'> <group master='hapy_user_hook'>
<slave>hapy_user_hook_on</slave> <slave>hapy_user_hook_on</slave>
<slave>hapy_user_hook_command</slave> <slave>hapy_user_hook_command</slave>