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

Merge branch 'add-ha' of https://dev-eole.ac-dijon.fr/git/eole-one-master into add-ha

Browse Source
This commit is contained in:
Philippe Caseiro 2019-03-01 14:03:24 +01:00
commit ecb6441aef
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dicos/29_one-master.xml
View File

@ -7,6 +7,7 @@
<file filelist='onesinglenode' name='/etc/one/sched.conf' rm='True'/> <file filelist='onesinglenode' name='/etc/one/sched.conf' rm='True'/>
<file filelist='onesinglenode' name='/var/lib/one/remotes/etc/vnm/OpenNebulaNetwork.conf' rm='True' mkdir='True'/> <file filelist='onesinglenode' name='/var/lib/one/remotes/etc/vnm/OpenNebulaNetwork.conf' rm='True' mkdir='True'/>
<file filelist='onesinglenode' name='/etc/one/auth/ldap_auth.conf'/> <file filelist='onesinglenode' name='/etc/one/auth/ldap_auth.conf'/>
<file filelist='one_ha' name='/usr/share/eole/bastion/data/60-one' mode='755'/>
<service>opennebula</service> <service>opennebula</service>
<service>opennebula-scheduler</service> <service>opennebula-scheduler</service>
@ -233,6 +234,7 @@
<target type='variable'>one_vip</target> <target type='variable'>one_vip</target>
<target type='variable'>one_vip_mask</target> <target type='variable'>one_vip_mask</target>
<target type='service_accesslist'>sunstone_xmlrpc</target> <target type='service_accesslist'>sunstone_xmlrpc</target>
<target type='filelist'>one_ha</target>
</condition> </condition>
<fill name='calc_val' target='one_vip_mask'> <fill name='calc_val' target='one_vip_mask'>

11
scripts/onehost_create_all
View File

@ -201,7 +201,6 @@ for host in ${HAPY_SLV}; do
EchoVert " * Enregistrement du noeud" EchoVert " * Enregistrement du noeud"
register_node ${host} register_node ${host}
# wait_node_ok ${host}
if [[ ${HAPY_HA} == "oui" ]] if [[ ${HAPY_HA} == "oui" ]]
then then
if [[ $DBMODE == "sqlite" ]] if [[ $DBMODE == "sqlite" ]]
@ -213,10 +212,12 @@ for host in ${HAPY_SLV}; do
fi fi
fi fi
sync_nodes sync_nodes
wait_node_ok ${HAPY_SLV[${i}]} if [[ ${HAPY_HA} != "oui" ]]
if [[ ${?} -ne 0 ]] wait_node_ok ${HAPY_SLV[${i}]}
then if [[ ${?} -ne 0 ]]
EchoRouge "Erreur lors de l'enregistrement du noeud ${HAPY_SLV[${i}]} !" then
EchoRouge "Erreur lors de l'enregistrement du noeud ${HAPY_SLV[${i}]} !"
fi
fi fi
done done

5
tmpl/60-one Normal file
View File

@ -0,0 +1,5 @@
#!/bin/bash
%for %%host in %%one_nodes
/sbin/iptables -A eth%%{one_node_int}-root -s %%host -p tcp --syn -j ACCEPT
%end for