From f04a68086435c6cbb88a856d51c59409764cc8f4 Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Mon, 18 Mar 2019 11:48:59 +0100
Subject: [PATCH] =?UTF-8?q?=C3=A9change=20de=20clef=20entre=20tous=20les?=
 =?UTF-8?q?=20noeuds=20du=20cluster?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 postservice/99-z-ha        | 17 ++++++-----------
 scripts/onehost_create_all | 15 ++++++++-------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/postservice/99-z-ha b/postservice/99-z-ha
index 88b70d4..3519978 100644
--- a/postservice/99-z-ha
+++ b/postservice/99-z-ha
@@ -1,15 +1,10 @@
 #!/bin/bash
 
-ha=$(CreoleGet activer_one_ha non)
-if [[ ${ha} == "oui" ]]
-then
-   indx=$(CreoleGet one_ha_server_index)
-else
-   indx="0"
-fi
-
-if [[ ${1} == "instance" ]] && [[ ${indx} == "0" ]]
-then
-   /usr/share/eole/sbin/onehost_create_all
+if [[ ${1} == "instance" ]]; then
+    ha=$(CreoleGet activer_one_ha non)
+    if [[ ${ha} == "oui" ]]
+    then
+       /usr/share/eole/sbin/onehost_create_all
+    fi
 fi
 exit 0
diff --git a/scripts/onehost_create_all b/scripts/onehost_create_all
index fe2ec74..994719a 100755
--- a/scripts/onehost_create_all
+++ b/scripts/onehost_create_all
@@ -163,12 +163,10 @@ 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
+    if [[ ${idx} = "0" ]]; then
         master=0
+    else
+        master=2
     fi
 fi
 
@@ -179,7 +177,7 @@ DBMODE=$(CreoleGet one_database_type "none")
 
 echo -e "\n"
 EchoBleu "Vous allez inscrire un noeud dans une grappe Hâpy"
-EchoBleu "Pour ce faire vous devez vous munir du mot de passe de l'utilisateur 'oneadmin' de chacun des noeuds"
+EchoBleu "Pour ce faire vous devez vous munir du mot de passe de l'utilisateur 'root' de chacun des noeuds"
 Question_ouinon  "Voulez-vous commencer ?" 'True' "oui"
 if [[ $? -ne 0 ]]
 then
@@ -195,6 +193,9 @@ for host in ${HAPY_SLV}; do
     EchoVert " * Gestion des clés SSH"
     echo
     copy_ssh_id ${host}
+    if [ $master = 2 ]; then
+        continue
+    fi
     if [ $master = 0 ]; then
         copy_files ${host}
     fi
@@ -211,9 +212,9 @@ for host in ${HAPY_SLV}; do
             fi
         fi
     fi
-    sync_nodes
     if [[ ${HAPY_HA} != "oui" ]]
     then
+        sync_nodes
         wait_node_ok ${HAPY_SLV[${i}]}
         if [[ ${?} -ne 0 ]]
         then