Merge branch 'add-ha' of https://dev-eole.ac-dijon.fr/git/eole-one-master into add-ha

dicos/29_one-master.xml

@@ -7,6 +7,7 @@
         <file filelist='onesinglenode' name='/etc/one/sched.conf' rm='True'/>
         <file filelist='onesinglenode' name='/var/lib/one/remotes/etc/vnm/OpenNebulaNetwork.conf' rm='True' mkdir='True'/>
         <file filelist='onesinglenode' name='/etc/one/auth/ldap_auth.conf'/>
+        <file filelist='one_ha' name='/usr/share/eole/bastion/data/60-one' mode='755'/>
 
         <service>opennebula</service>
         <service>opennebula-scheduler</service>
@@ -233,6 +234,7 @@
             <target type='variable'>one_vip</target>
             <target type='variable'>one_vip_mask</target>
             <target type='service_accesslist'>sunstone_xmlrpc</target>
+            <target type='filelist'>one_ha</target>
         </condition>
 
         <fill name='calc_val' target='one_vip_mask'>

scripts/onehost_create_all

@@ -201,7 +201,6 @@ for host in ${HAPY_SLV}; do
 
     EchoVert " * Enregistrement du noeud"
     register_node ${host}
-    # wait_node_ok ${host}
     if [[ ${HAPY_HA} == "oui" ]]
     then
         if [[ $DBMODE == "sqlite" ]]
@@ -213,10 +212,12 @@ for host in ${HAPY_SLV}; do
         fi
     fi
     sync_nodes
-    wait_node_ok ${HAPY_SLV[${i}]}
-    if [[ ${?} -ne 0 ]]
-    then
-        EchoRouge "Erreur lors de l'enregistrement du noeud ${HAPY_SLV[${i}]} !"
+    if [[ ${HAPY_HA} != "oui" ]]
+        wait_node_ok ${HAPY_SLV[${i}]}
+        if [[ ${?} -ne 0 ]]
+        then
+            EchoRouge "Erreur lors de l'enregistrement du noeud ${HAPY_SLV[${i}]} !"
+        fi
     fi
 done
 

tmpl/60-one

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+%for %%host in %%one_nodes
+/sbin/iptables -A eth%%{one_node_int}-root -s %%host -p tcp --syn -j ACCEPT
+%end for