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

diagnose/04-virtualisation

@@ -80,7 +80,7 @@ then
   echo ""
 else
   for VM in $VMs ; do
-    NAME=$( one "onevm show $VM" | grep 'NAME' | cut -d: -f2 )
+    NAME=$( one "onevm show $VM" | grep '^NAME' | cut -d: -f2 )
     STAT=$(one "onevm show $VM" | grep '^STATE'  | cut -d: -f2 | tr -d ' ' )
     printf ".  %${len_pf}s => " "$NAME"
     eOneStatus "$STAT"

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'>

postservice/31-one-netmng

@@ -303,6 +303,14 @@ def main():
     logger.debug(u"Configure OpenNebula networks")
 
     client = CreoleClient()
+    
+    mode_ha = client.get_creole('activer_one_ha')
+    if mode_ha == "oui":
+        indx = client.get_creole('one_ha_server_index')
+        if indx != 0:
+            # Mode HA is on and we are not in the Leader
+            exit(0)
+
     one_client = OneClient('oneadmin')
     networks = []
     cluster = client.get_creole('one_cluster_name')

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 [[ ${HAPY_HA} != "oui" ]]
-    if [[ ${?} -ne 0 ]]
+        wait_node_ok ${HAPY_SLV[${i}]}
-    then
+        if [[ ${?} -ne 0 ]]
-        EchoRouge "Erreur lors de l'enregistrement du noeud ${HAPY_SLV[${i}]} !"
+        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