From 89128ccba5515875d819a51d43e3d3600baabaf4 Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Fri, 1 Mar 2019 12:07:16 +0100
Subject: [PATCH 1/2] remove node wait in HA mode

---
 scripts/onehost_create_all | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/onehost_create_all b/scripts/onehost_create_all
index af8a690..a3ac59e 100755
--- a/scripts/onehost_create_all
+++ b/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
 

From 8ce8a16a0ba883a77b6e8908cab921ccb87e7a97 Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Fri, 1 Mar 2019 12:30:00 +0100
Subject: [PATCH 2/2] no firewall rule between nodes

---
 dicos/29_one-master.xml | 2 ++
 tmpl/60-one             | 5 +++++
 2 files changed, 7 insertions(+)
 create mode 100644 tmpl/60-one

diff --git a/dicos/29_one-master.xml b/dicos/29_one-master.xml
index 0f6619f..7657de7 100644
--- a/dicos/29_one-master.xml
+++ b/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'>
diff --git a/tmpl/60-one b/tmpl/60-one
new file mode 100644
index 0000000..24d4dfc
--- /dev/null
+++ b/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