Merge branch 'develop' into dist/eole/2.7.0/develop
This commit is contained in:
commit
aa1d163154
|
@ -456,8 +456,11 @@ function init_ha() {
|
||||||
function main()
|
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" ] && [ "$(CreoleGet one_ha_server_index)" = "0" ]; then
|
if [ "$(CreoleGet activer_one_ha)" = "oui" ]; then
|
||||||
init_ha
|
|
||||||
|
if [ "$(CreoleGet one_ha_server_index)" != "0" ]; then
|
||||||
|
return
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
#
|
#
|
||||||
# Rename default cluster
|
# Rename default cluster
|
||||||
|
@ -490,6 +493,13 @@ function main()
|
||||||
# Création des Datastores
|
# Création des Datastores
|
||||||
#
|
#
|
||||||
manage_datastores "${clst_name}"
|
manage_datastores "${clst_name}"
|
||||||
|
|
||||||
|
#
|
||||||
|
# Dans le cas du mode HA, seul le leader fait l'init
|
||||||
|
#
|
||||||
|
if [ "$(CreoleGet activer_one_ha)" = "oui" ]; then
|
||||||
|
init_ha
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
main
|
main
|
||||||
|
|
Loading…
Reference in New Issue