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

Merge branch '2.6.0/master'

This commit is contained in:
Philippe Caseiro 2016-10-14 16:15:43 +02:00
parent 5c18a0b5f5 95a74c0f0a
commit 899761e535
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/onehost_create_all
View File

@ -14,7 +14,17 @@
function copy_ssh_id() function copy_ssh_id()
{ {
local ip=${1} local ip=${1}
su - ${ONEUSER} -c "ssh-copy-id ${ip}"
ssh ${ip} bash -s <<EOF
echo $(cat ~oneadmin/.ssh/id_rsa.pub) > /tmp/one-master.key.pub
if ! grep -qs /tmp/one-master.key.pub ~oneadmin/.ssh/authorized_keys
then
cat /tmp/one-master.key.pub >> ~oneadmin/.ssh/authorized_keys
chown oneadmin:oneadmin ~oneadmin/.ssh/authorized_keys
fi
rm -f /tmp/one-master.key.pub
EOF
return ${?}
} }
# #
@ -26,7 +36,7 @@ function register_node()
{ {
# ref https://dev-eole.ac-dijon.fr/issues/16797 # ref https://dev-eole.ac-dijon.fr/issues/16797
#cmd="onehost create -i kvm -v kvm -n ovswitch -c \"$(CreoleGet one_cluster_name)\" ${1}" #cmd="onehost create -i kvm -v kvm -n ovswitch -c \"$(CreoleGet one_cluster_name)\" ${1}"
cmd="onehost create -i kvm -v kvm -n ovswitch -c \"default\" ${1}" cmd="onehost create -i kvm -v kvm -c \"default\" ${1}"
ret=$(su - ${ONEUSER} -c -- "${cmd}") ret=$(su - ${ONEUSER} -c -- "${cmd}")
return $? return $?
} }
@ -105,6 +115,8 @@ do
EchoVert " * Gestion des clés SSH" EchoVert " * Gestion des clés SSH"
echo echo
copy_ssh_id ${HAPY_SLV_IP[${i}]} copy_ssh_id ${HAPY_SLV_IP[${i}]}
[[ ${?} -ne 0 ]] && EchoRouge "Erreur lors de l'échange de clés SSH avec le noeud ${HAPY_SLV[${i}]}}"
EchoVert " * Enregistrement du noeud" EchoVert " * Enregistrement du noeud"
register_node ${HAPY_SLV[${i}]} register_node ${HAPY_SLV[${i}]}
wait_node_ok ${HAPY_SLV[${i}]} wait_node_ok ${HAPY_SLV[${i}]}