diff --git a/dicos/29_one-master.xml b/dicos/29_one-master.xml index 0f6619f..7657de7 100644 --- a/dicos/29_one-master.xml +++ b/dicos/29_one-master.xml @@ -7,6 +7,7 @@ + opennebula opennebula-scheduler @@ -233,6 +234,7 @@ one_vip one_vip_mask sunstone_xmlrpc + one_ha diff --git a/scripts/onehost_create_all b/scripts/onehost_create_all index af8a690..a3ac59e 100755 --- a/scripts/onehost_create_all +++ b/scripts/onehost_create_all @@ -201,7 +201,6 @@ for host in ${HAPY_SLV}; do EchoVert " * Enregistrement du noeud" register_node ${host} - # wait_node_ok ${host} if [[ ${HAPY_HA} == "oui" ]] then if [[ $DBMODE == "sqlite" ]] @@ -213,10 +212,12 @@ for host in ${HAPY_SLV}; do fi fi sync_nodes - wait_node_ok ${HAPY_SLV[${i}]} - if [[ ${?} -ne 0 ]] - then - EchoRouge "Erreur lors de l'enregistrement du noeud ${HAPY_SLV[${i}]} !" + if [[ ${HAPY_HA} != "oui" ]] + wait_node_ok ${HAPY_SLV[${i}]} + if [[ ${?} -ne 0 ]] + then + EchoRouge "Erreur lors de l'enregistrement du noeud ${HAPY_SLV[${i}]} !" + fi fi done diff --git a/tmpl/60-one b/tmpl/60-one new file mode 100644 index 0000000..24d4dfc --- /dev/null +++ b/tmpl/60-one @@ -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