Merge branch 'develop'
This commit is contained in:
commit
597e6eb46d
|
|
@ -51,7 +51,7 @@
|
|||
<variable name="one_database_type" description="Moteur de base de données a utiliser" type="string" mode="expert">
|
||||
<value>sqlite</value>
|
||||
</variable>
|
||||
<variable name="one_database_host" description="Adresse du serveur de base de données (mySQL uniquement)" mandatory="True" mode="expert"/>
|
||||
<variable name="one_database_host" description="Adresse du serveur de base de données (MySQL uniquement)" mandatory="True" mode="expert"/>
|
||||
<variable name="one_database_port" description="Port d'écoute du serveur de base de données" mode="expert" type="number" mandatory="True">
|
||||
<value>3306</value>
|
||||
</variable>
|
||||
|
|
@ -113,6 +113,18 @@
|
|||
<variable name='one_node_int_name' type='domain' description="Nom de l'interface de communication des nœuds"/>
|
||||
<variable name="one_vip" description="Adresse IP de la VIP OpenNebula" type="ip" mandatory="True"/>
|
||||
<variable name="one_vip_mask" description="Masque de sous-réseau de la VIP OpenNebula" type="netmask" mandatory="True"/>
|
||||
<variable name="one_max_conn" description="Nombre maximum de connexion TCP simultanées maintenu avec le serveur" mode="expert" type='number'>
|
||||
<value>15</value>
|
||||
</variable>
|
||||
<variable name="one_max_conn_backlog" description="Nombre maximum de connexion TCP simultanées accepté par le système d'exploitation" mode="expert" type='number'>
|
||||
<value>15</value>
|
||||
</variable>
|
||||
<variable name="one_keepalive_timeout" description="Durée maximum d'une connexion RPC en secondes" mode="expert" type='number'>
|
||||
<value>30</value>
|
||||
</variable>
|
||||
<variable name="one_rpc_log" description="Créer un fichier séparé pour les log XML-RPC" mode="expert">
|
||||
<value>NO</value>
|
||||
</variable>
|
||||
</family>
|
||||
<family name='Modèle' icon='cloud'>
|
||||
<variable name='hapy_init_master' type='oui/non' description="Activer l'auto-création du modèle de machine virtuelle pour installer un module EOLE">
|
||||
|
|
@ -157,6 +169,9 @@
|
|||
<check name="valid_enum" target="vnet_pilote">
|
||||
<param>['openvswitch']</param>
|
||||
</check>
|
||||
<check name="valid_enum" target="one_rpc_log">
|
||||
<param>['YES', 'NO']</param>
|
||||
</check>
|
||||
<auto name='calc_multi_condition' target='activer_openvswitch'>
|
||||
<param>openvswitch</param>
|
||||
<param type="eole" name="condition_1">vnet_pilote</param>
|
||||
|
|
@ -174,6 +189,7 @@
|
|||
<condition name='disabled_if_in' source='activer_onesinglenode'>
|
||||
<param>non</param>
|
||||
<target type='filelist'>onesinglenode</target>
|
||||
<target type='filelist'>one_ha</target>
|
||||
<target type='family'>Modèle</target>
|
||||
<target type='variable'>one_ds_system_prefix</target>
|
||||
<target type='variable'>one_ds_iso_name</target>
|
||||
|
|
|
|||
|
|
@ -1,15 +1,10 @@
|
|||
#!/bin/bash
|
||||
|
||||
if [[ ${1} == "instance" ]]; then
|
||||
ha=$(CreoleGet activer_one_ha non)
|
||||
if [[ ${ha} == "oui" ]]
|
||||
then
|
||||
indx=$(CreoleGet one_ha_server_index)
|
||||
else
|
||||
indx="0"
|
||||
fi
|
||||
|
||||
if [[ ${1} == "instance" ]] && [[ ${indx} == "0" ]]
|
||||
then
|
||||
/usr/share/eole/sbin/onehost_create_all
|
||||
fi
|
||||
fi
|
||||
exit 0
|
||||
|
|
|
|||
|
|
@ -163,12 +163,10 @@ HAPY_HA=$(CreoleGet activer_one_ha "non")
|
|||
master=1
|
||||
if [[ ${HAPY_HA} == "oui" ]]; then
|
||||
idx=$(CreoleGet one_ha_server_index)
|
||||
if [[ ${idx} != "0" ]]; then
|
||||
EchoBleu "Mode HA: (on) Index : [${idx}]"
|
||||
echo -e "\t$(basename ${0}) doit être lancé uniquement sur le leader (index 0)"
|
||||
exit 0
|
||||
else
|
||||
if [[ ${idx} = "0" ]]; then
|
||||
master=0
|
||||
else
|
||||
master=2
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -179,7 +177,7 @@ DBMODE=$(CreoleGet one_database_type "none")
|
|||
|
||||
echo -e "\n"
|
||||
EchoBleu "Vous allez inscrire un noeud dans une grappe Hâpy"
|
||||
EchoBleu "Pour ce faire vous devez vous munir du mot de passe de l'utilisateur 'oneadmin' de chacun des noeuds"
|
||||
EchoBleu "Pour ce faire vous devez vous munir du mot de passe de l'utilisateur 'root' de chacun des noeuds"
|
||||
Question_ouinon "Voulez-vous commencer ?" 'True' "oui"
|
||||
if [[ $? -ne 0 ]]
|
||||
then
|
||||
|
|
@ -195,6 +193,9 @@ for host in ${HAPY_SLV}; do
|
|||
EchoVert " * Gestion des clés SSH"
|
||||
echo
|
||||
copy_ssh_id ${host}
|
||||
if [ $master = 2 ]; then
|
||||
continue
|
||||
fi
|
||||
if [ $master = 0 ]; then
|
||||
copy_files ${host}
|
||||
fi
|
||||
|
|
@ -211,9 +212,9 @@ for host in ${HAPY_SLV}; do
|
|||
fi
|
||||
fi
|
||||
fi
|
||||
sync_nodes
|
||||
if [[ ${HAPY_HA} != "oui" ]]
|
||||
then
|
||||
sync_nodes
|
||||
wait_node_ok ${HAPY_SLV[${i}]}
|
||||
if [[ ${?} -ne 0 ]]
|
||||
then
|
||||
|
|
|
|||
|
|
@ -164,12 +164,12 @@ FEDERATION = [
|
|||
]
|
||||
|
||||
RAFT = [
|
||||
LIMIT_PURGE = 100000,
|
||||
LOG_RETENTION = 500000,
|
||||
LOG_PURGE_TIMEOUT = 600,
|
||||
LIMIT_PURGE = 1000,
|
||||
LOG_RETENTION = 5000,
|
||||
LOG_PURGE_TIMEOUT = 60,
|
||||
ELECTION_TIMEOUT_MS = 2500,
|
||||
BROADCAST_TIMEOUT_MS = 500,
|
||||
XMLRPC_TIMEOUT_MS = 450
|
||||
XMLRPC_TIMEOUT_MS = 5000
|
||||
]
|
||||
|
||||
%if %%activer_one_ha == 'oui'
|
||||
|
|
@ -241,12 +241,12 @@ DEFAULT_COST = [
|
|||
# %% -- %
|
||||
#*******************************************************************************
|
||||
|
||||
#MAX_CONN = 15
|
||||
#MAX_CONN_BACKLOG = 15
|
||||
MAX_CONN = %%one_max_conn
|
||||
MAX_CONN_BACKLOG = %%one_max_conn_backlog
|
||||
#KEEPALIVE_TIMEOUT = 15
|
||||
#KEEPALIVE_MAX_CONN = 30
|
||||
KEEPALIVE_MAX_CONN = %%one_keepalive_timeout
|
||||
#TIMEOUT = 15
|
||||
#RPC_LOG = NO
|
||||
RPC_LOG = %%one_rpc_log
|
||||
#MESSAGE_SIZE = 1073741824
|
||||
#LOG_CALL_FORMAT = "Req:%i UID:%u %m invoked %l20"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue