From d9cac17d809c0ec5f82b783ac84fa845992773e6 Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Wed, 27 Feb 2019 17:13:21 +0100
Subject: [PATCH] =?UTF-8?q?ouvrir=20les=20r=C3=A8gles=20de=20firewall=20po?=
 =?UTF-8?q?ur=20l'interface=20donn=C3=A9e=20par=20l'utilisateur?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/dicos/29_one-master.xml b/dicos/29_one-master.xml
index e6e0068..0f6619f 100644
--- a/dicos/29_one-master.xml
+++ b/dicos/29_one-master.xml
@@ -29,7 +29,7 @@
         </service_access>
 
         <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>
     </files>
     <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='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_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_mask" description="Masque de sous-réseau de la VIP OpenNebula" type="netmask" mandatory="True"/>
         </family>
@@ -203,9 +205,19 @@
             <target type="variable">one_database_connections</target>
         </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'>
             <param>non</param>
             <target type='variable'>one_nodes</target>
+            <target type='variable'>one_node_int</target>
+            <target type='variable'>one_node_int_name</target>
         </condition>
         <fill name='calc_val' target='activer_multinode'>
             <param type='eole' name='valeur'>activer_one_ha</param>