Cadoles
/
eole-one-master
20
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
vincent 2019-02-22 17:18:35 +01:00
parent d89f1dfdeb 41d45ed2a2
commit d2caf81c1f
3 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
postservice/30-one-mng
View File

@ -447,6 +447,7 @@ function main()
wait_true_retcode "Wait for oned to be started" "onecluster show 0 > /dev/null" wait_true_retcode "Wait for oned to be started" "onecluster show 0 > /dev/null"
if [ "$(CreoleGet activer_one_ha)" = "oui" ]; then if [ "$(CreoleGet activer_one_ha)" = "oui" ]; then
if [ "$(CreoleGet one_ha_server_index)" != "0" ]; then if [ "$(CreoleGet one_ha_server_index)" != "0" ]; then
# ne pas faire sur les followers
return return
fi fi
fi fi
@ -461,11 +462,15 @@ function main()
# #
# Creating Host # Creating Host
# #
if [ "$(CreoleGet activer_one_ha)" = "oui" ]; then
/usr/share/eole/sbin/onehost_create_all
else
if [[ $(CreoleGet eole_module non) != 'hapy-master' ]] if [[ $(CreoleGet eole_module non) != 'hapy-master' ]]
then then
host=$(CreoleGet nom_machine) host=$(CreoleGet nom_machine)
manage_host ${host} manage_host ${host}
fi fi
fi
# #
# Attaching Host to the Cluster # Attaching Host to the Cluster

4
postservice/99-z-ha
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
function init_ha() { function init_ha_leader() {
# server with index 1 exists if already instanciate # server with index 1 exists if already instanciate
onezone show 0 | grep -A 3 ^"HA & FEDERATION SYNC STATUS" | tail -n 1 | grep -q ^" 1 " onezone show 0 | grep -A 3 ^"HA & FEDERATION SYNC STATUS" | tail -n 1 | grep -q ^" 1 "
if [ ! $? = 0 ]; then if [ ! $? = 0 ]; then
@ -13,7 +13,7 @@ function init_ha() {
if [ "$(CreoleGet activer_one_ha)" = "oui" ]; then if [ "$(CreoleGet activer_one_ha)" = "oui" ]; then
if [ "$(CreoleGet one_ha_server_index)" = "0" ]; then if [ "$(CreoleGet one_ha_server_index)" = "0" ]; then
init_ha init_ha_leader
fi fi
fi fi

20
scripts/onehost_create_all
View File

@ -13,17 +13,17 @@
# #
function copy_ssh_id() function copy_ssh_id()
{ {
local ip=${1} local host=${1}
ssh ${ip} bash -s <<EOF CLEF=$(cat ~oneadmin/.ssh/id_rsa.pub)
echo $(cat ~oneadmin/.ssh/id_rsa.pub) > /tmp/one-master.key.pub ssh ${host} bash -s <<EOF
if ! grep -qs /tmp/one-master.key.pub ~oneadmin/.ssh/authorized_keys if ! grep -qs $CLEF ~oneadmin/.ssh/authorized_keys
then then
cat /tmp/one-master.key.pub >> ~oneadmin/.ssh/authorized_keys echo $CLEF >> ~oneadmin/.ssh/authorized_keys
chown oneadmin:oneadmin ~oneadmin/.ssh/authorized_keys chown oneadmin:oneadmin ~oneadmin/.ssh/authorized_keys
fi fi
rm -f /tmp/one-master.key.pub
EOF EOF
su - oneadmin -c "ssh-keyscan $host"
return ${?} return ${?}
} }
@ -103,6 +103,11 @@ then
exit 1 exit 1
fi fi
if [ "$(CreoleGet activer_one_ha)" = "oui" ] && [ "$(CreoleGet one_ha_server_index)" != "0" ]; then
follower=0
else
follower=1
fi
for ((i = 0; i < ${#HAPY_SLV[*]}; i +=1)) for ((i = 0; i < ${#HAPY_SLV[*]}; i +=1))
do do
echo -e "\n" echo -e "\n"
@ -112,6 +117,9 @@ do
echo echo
copy_ssh_id ${HAPY_SLV[${i}]} copy_ssh_id ${HAPY_SLV[${i}]}
[[ ${?} -ne 0 ]] && EchoRouge "Erreur lors de l'échange de clés SSH avec le noeud ${HAPY_SLV[${i}]}}" [[ ${?} -ne 0 ]] && EchoRouge "Erreur lors de l'échange de clés SSH avec le noeud ${HAPY_SLV[${i}]}}"
if [ $follower = 0 ]; then
continue
fi
EchoVert " * Enregistrement du noeud" EchoVert " * Enregistrement du noeud"
register_node ${HAPY_SLV[${i}]} register_node ${HAPY_SLV[${i}]}