diff --git a/scripts/onehost_create_all b/scripts/onehost_create_all
index a3ac59e..ee8f156 100755
--- a/scripts/onehost_create_all
+++ b/scripts/onehost_create_all
@@ -156,6 +156,7 @@ if [[ $HAPY_NODE_SUPPORT == "non" ]]
 then
     EchoRouge "Le mode multi-noeuds n'est pas activé dans l'interface de configuration du module"
     exit 1
+<<<<<<< HEAD
 fi
 
 HAPY_HA=$(CreoleGet activer_one_ha "non")
@@ -172,6 +173,24 @@ if [[ ${HAPY_HA} == "oui" ]]; then
     fi
 fi
 
+=======
+fi
+
+HAPY_HA=$(CreoleGet activer_one_ha "non")
+
+master=1
+if [[ ${HAPY_HA} == "oui" ]]; then
+    idx=$(CreoleGet one_ha_server_index)
+    if [[ ${idx} != "0" ]]; then
+        EchoBleu "Mode HA: (on) Index : [${idx}]"
+        echo -e "\t$(basename ${0}) doit être lancé uniquement sur le leader (index 0)"
+        exit 0
+    else
+        master=0
+    fi
+fi
+
+>>>>>>> dcc8eeeecee5c5824e31c73b5ddf04590714f606
 declare -a HAPY_SLV=('')
 ONEUSER=$(CreoleGet virt_user)
 HAPY_SLV=$(echo $(CreoleGet one_nodes) | sed -e "s/\n/ /g")
@@ -213,6 +232,10 @@ for host in ${HAPY_SLV}; do
     fi
     sync_nodes
     if [[ ${HAPY_HA} != "oui" ]]
+<<<<<<< HEAD
+=======
+    then
+>>>>>>> dcc8eeeecee5c5824e31c73b5ddf04590714f606
         wait_node_ok ${HAPY_SLV[${i}]}
         if [[ ${?} -ne 0 ]]
         then