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

Merge branch 'develop' into dist/eole/2.7.0/develop

This commit is contained in:
vincent 2019-02-27 17:19:39 +01:00
parent 79878882ea d9cac17d80
commit 2b2b064713
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dicos/29_one-master.xml
View File

@ -29,7 +29,7 @@
</service_access> </service_access>
<service_restriction service='sunstone_xmlrpc'> <service_restriction service='sunstone_xmlrpc'>
<ip interface='eth0' ip_type='SymLinkOption'>one_nodes</ip> <ip interface='one_node_int_name' interface_type='SymLinkOption' ip_type='SymLinkOption'>one_nodes</ip>
</service_restriction> </service_restriction>
</files> </files>
<variables> <variables>
@ -108,6 +108,8 @@
<variable name='activer_multinode' description="Activer l'intégration de plusieurs nœuds de virtualisation" mode='expert' type='oui/non'/> <variable name='activer_multinode' description="Activer l'intégration de plusieurs nœuds de virtualisation" mode='expert' type='oui/non'/>
<variable name='one_nodes' type='domain' description="Nom du nœud de virtualisation" multi='True' mandatory='True'/> <variable name='one_nodes' type='domain' description="Nom du nœud de virtualisation" multi='True' mandatory='True'/>
<variable name="one_ha_server_index" description="Index du serveur dans la liste des nœuds de virtualisation" type="number" mandatory="True"/> <variable name="one_ha_server_index" description="Index du serveur dans la liste des nœuds de virtualisation" type="number" mandatory="True"/>
<variable name='one_node_int' type='domain' description="Interface de communication des nœuds" mandatory='True'/>
<variable name='one_node_int_name' type='domain' description="Nom de l'interface de communication des nœuds"/>
<variable name="one_vip" description="Adresse IP de la VIP OpenNebula" type="ip" mandatory="True"/> <variable name="one_vip" description="Adresse IP de la VIP OpenNebula" type="ip" mandatory="True"/>
<variable name="one_vip_mask" description="Masque de sous-réseau de la VIP OpenNebula" type="netmask" mandatory="True"/> <variable name="one_vip_mask" description="Masque de sous-réseau de la VIP OpenNebula" type="netmask" mandatory="True"/>
</family> </family>
@ -203,9 +205,19 @@
<target type="variable">one_database_connections</target> <target type="variable">one_database_connections</target>
</condition> </condition>
<check name="valid_enum" target="one_node_int">
<param>['0','1','2','3','4']</param>
</check>
<auto name='concat' target='one_node_int_name'>
<param>eth</param>
<param type='eole'>one_node_int</param>
</auto>
<condition name='disabled_if_in' source='activer_multinode'> <condition name='disabled_if_in' source='activer_multinode'>
<param>non</param> <param>non</param>
<target type='variable'>one_nodes</target> <target type='variable'>one_nodes</target>
<target type='variable'>one_node_int</target>
<target type='variable'>one_node_int_name</target>
</condition> </condition>
<fill name='calc_val' target='activer_multinode'> <fill name='calc_val' target='activer_multinode'>
<param type='eole' name='valeur'>activer_one_ha</param> <param type='eole' name='valeur'>activer_one_ha</param>