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

This commit is contained in:
vincent 2019-02-25 15:47:08 +01:00
commit e95ac1b8c6
1 changed files with 9 additions and 4 deletions

View File

@ -31,6 +31,12 @@ EOF
fi fi
} }
function copy_files()
{
local host=${1}
su - oneadmin -c "scp ~oneadmin/.one/* ${host}:oneadmin/.one/"
}
# #
# NAME: register_node # NAME: register_node
# AIM: register the node in OpenNebula master # AIM: register the node in OpenNebula master
@ -138,11 +144,10 @@ then
exit 1 exit 1
fi fi
follower=1
master=1 master=1
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
follower=0 exit 0
else else
master=0 master=0
fi fi
@ -154,8 +159,8 @@ for host in ${HAPY_SLV}; do
EchoVert " * Gestion des clés SSH" EchoVert " * Gestion des clés SSH"
echo echo
copy_ssh_id ${host} copy_ssh_id ${host}
if [ $follower = 0 ]; then if [ $master = 0 ]; then
continue copy_files ${host}
fi fi
EchoVert " * Enregistrement du noeud" EchoVert " * Enregistrement du noeud"