Compare commits
6 Commits
sauvegarde
...
master
Author | SHA1 | Date |
---|---|---|
vincent | 597e6eb46d | |
Emmanuel Garette | 17f759bc08 | |
Joël Cuissinat | 0d68553e4c | |
Joël Cuissinat | dfa08819fe | |
Emmanuel Garette | f04a680864 | |
Emmanuel Garette | a66663e997 |
|
@ -1 +0,0 @@
|
||||||
7
|
|
|
@ -1,11 +0,0 @@
|
||||||
Source: eole-one-master
|
|
||||||
Section: web
|
|
||||||
Priority: optional
|
|
||||||
Maintainer: Cadoles <contact@cadoles.com>
|
|
||||||
Build-Depends: debhelper (>= 9)
|
|
||||||
Standards-Version: 3.9.3
|
|
||||||
|
|
||||||
Package: eole-one-master
|
|
||||||
Architecture: amd64
|
|
||||||
Depends: ${misc:Depends}, sqlite3, ruby-xmlrpc, eole-ovs, eole-libvirt, opennebula, mysql-client
|
|
||||||
Description: Eolisation de Hapy master (Cadoles)
|
|
|
@ -1,44 +0,0 @@
|
||||||
Format: http://dep.debian.net/deps/dep5
|
|
||||||
Upstream-Name: {PROJECT}
|
|
||||||
Source: {URL}
|
|
||||||
|
|
||||||
Files: *
|
|
||||||
Copyright: YEAR {UPSTREAM} {AUTHOR} <{MAIL}>
|
|
||||||
License: {UPSTREAM LICENSE}
|
|
||||||
|
|
||||||
Files: debian/*
|
|
||||||
Copyright: 2012 Équipe EOLE <eole@ac-dijon.fr>
|
|
||||||
License: CeCILL-2
|
|
||||||
|
|
||||||
License: {UPSTREAM LICENSE}
|
|
||||||
{TEXT OF THE LICENSE}
|
|
||||||
|
|
||||||
License: CeCILL-2
|
|
||||||
This software is governed by the CeCILL-2 license under French law and
|
|
||||||
abiding by the rules of distribution of free software. You can use,
|
|
||||||
modify and or redistribute the software under the terms of the CeCILL-2
|
|
||||||
license as circulated by CEA, CNRS and INRIA at the following URL
|
|
||||||
"http://www.cecill.info";.
|
|
||||||
.
|
|
||||||
As a counterpart to the access to the source code and rights to copy,
|
|
||||||
modify and redistribute granted by the license, users are provided only
|
|
||||||
with a limited warranty and the software's author, the holder of the
|
|
||||||
economic rights, and the successive licensors have only limited
|
|
||||||
liability.
|
|
||||||
.
|
|
||||||
In this respect, the user's attention is drawn to the risks associated
|
|
||||||
with loading, using, modifying and/or developing or reproducing the
|
|
||||||
software by the user in light of its specific status of free software,
|
|
||||||
that may mean that it is complicated to manipulate, and that also
|
|
||||||
therefore means that it is reserved for developers and experienced
|
|
||||||
professionals having in-depth computer knowledge. Users are therefore
|
|
||||||
encouraged to load and test the software's suitability as regards their
|
|
||||||
requirements in conditions enabling the security of their systems and/or
|
|
||||||
data to be ensured and, more generally, to use and operate it in the
|
|
||||||
same conditions as regards security.
|
|
||||||
.
|
|
||||||
The fact that you are presently reading this means that you have had
|
|
||||||
knowledge of the CeCILL-2 license and that you accept its terms.
|
|
||||||
.
|
|
||||||
On Eole systems, the complete text of the CeCILL-2 License can be found
|
|
||||||
in '/usr/share/common-licenses/CeCILL-2-en'.
|
|
|
@ -1,8 +0,0 @@
|
||||||
#!/usr/bin/make -f
|
|
||||||
# -*- makefile -*-
|
|
||||||
|
|
||||||
# Uncomment this to turn on verbose mode.
|
|
||||||
# export DH_VERBOSE=1
|
|
||||||
|
|
||||||
%:
|
|
||||||
dh $@
|
|
|
@ -1 +0,0 @@
|
||||||
3.0 (quilt)
|
|
|
@ -51,7 +51,7 @@
|
||||||
<variable name="one_database_type" description="Moteur de base de données a utiliser" type="string" mode="expert">
|
<variable name="one_database_type" description="Moteur de base de données a utiliser" type="string" mode="expert">
|
||||||
<value>sqlite</value>
|
<value>sqlite</value>
|
||||||
</variable>
|
</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">
|
<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>
|
<value>3306</value>
|
||||||
</variable>
|
</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_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" 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_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>
|
||||||
<family name='Modèle' icon='cloud'>
|
<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">
|
<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">
|
<check name="valid_enum" target="vnet_pilote">
|
||||||
<param>['openvswitch']</param>
|
<param>['openvswitch']</param>
|
||||||
</check>
|
</check>
|
||||||
|
<check name="valid_enum" target="one_rpc_log">
|
||||||
|
<param>['YES', 'NO']</param>
|
||||||
|
</check>
|
||||||
<auto name='calc_multi_condition' target='activer_openvswitch'>
|
<auto name='calc_multi_condition' target='activer_openvswitch'>
|
||||||
<param>openvswitch</param>
|
<param>openvswitch</param>
|
||||||
<param type="eole" name="condition_1">vnet_pilote</param>
|
<param type="eole" name="condition_1">vnet_pilote</param>
|
||||||
|
@ -174,6 +189,7 @@
|
||||||
<condition name='disabled_if_in' source='activer_onesinglenode'>
|
<condition name='disabled_if_in' source='activer_onesinglenode'>
|
||||||
<param>non</param>
|
<param>non</param>
|
||||||
<target type='filelist'>onesinglenode</target>
|
<target type='filelist'>onesinglenode</target>
|
||||||
|
<target type='filelist'>one_ha</target>
|
||||||
<target type='family'>Modèle</target>
|
<target type='family'>Modèle</target>
|
||||||
<target type='variable'>one_ds_system_prefix</target>
|
<target type='variable'>one_ds_system_prefix</target>
|
||||||
<target type='variable'>one_ds_iso_name</target>
|
<target type='variable'>one_ds_iso_name</target>
|
||||||
|
|
|
@ -1,15 +1,10 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
if [[ ${1} == "instance" ]]; then
|
||||||
ha=$(CreoleGet activer_one_ha non)
|
ha=$(CreoleGet activer_one_ha non)
|
||||||
if [[ ${ha} == "oui" ]]
|
if [[ ${ha} == "oui" ]]
|
||||||
then
|
|
||||||
indx=$(CreoleGet one_ha_server_index)
|
|
||||||
else
|
|
||||||
indx="0"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ${1} == "instance" ]] && [[ ${indx} == "0" ]]
|
|
||||||
then
|
then
|
||||||
/usr/share/eole/sbin/onehost_create_all
|
/usr/share/eole/sbin/onehost_create_all
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
exit 0
|
exit 0
|
||||||
|
|
|
@ -156,7 +156,6 @@ if [[ $HAPY_NODE_SUPPORT == "non" ]]
|
||||||
then
|
then
|
||||||
EchoRouge "Le mode multi-noeuds n'est pas activé dans l'interface de configuration du module"
|
EchoRouge "Le mode multi-noeuds n'est pas activé dans l'interface de configuration du module"
|
||||||
exit 1
|
exit 1
|
||||||
<<<<<<< HEAD
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
HAPY_HA=$(CreoleGet activer_one_ha "non")
|
HAPY_HA=$(CreoleGet activer_one_ha "non")
|
||||||
|
@ -164,33 +163,13 @@ HAPY_HA=$(CreoleGet activer_one_ha "non")
|
||||||
master=1
|
master=1
|
||||||
if [[ ${HAPY_HA} == "oui" ]]; then
|
if [[ ${HAPY_HA} == "oui" ]]; then
|
||||||
idx=$(CreoleGet one_ha_server_index)
|
idx=$(CreoleGet one_ha_server_index)
|
||||||
if [[ ${idx} != "0" ]]; then
|
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
|
|
||||||
master=0
|
master=0
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
=======
|
|
||||||
fi
|
|
||||||
|
|
||||||
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
|
else
|
||||||
master=0
|
master=2
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
>>>>>>> dcc8eeeecee5c5824e31c73b5ddf04590714f606
|
|
||||||
declare -a HAPY_SLV=('')
|
declare -a HAPY_SLV=('')
|
||||||
ONEUSER=$(CreoleGet virt_user)
|
ONEUSER=$(CreoleGet virt_user)
|
||||||
HAPY_SLV=$(echo $(CreoleGet one_nodes) | sed -e "s/\n/ /g")
|
HAPY_SLV=$(echo $(CreoleGet one_nodes) | sed -e "s/\n/ /g")
|
||||||
|
@ -198,7 +177,7 @@ DBMODE=$(CreoleGet one_database_type "none")
|
||||||
|
|
||||||
echo -e "\n"
|
echo -e "\n"
|
||||||
EchoBleu "Vous allez inscrire un noeud dans une grappe Hâpy"
|
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"
|
Question_ouinon "Voulez-vous commencer ?" 'True' "oui"
|
||||||
if [[ $? -ne 0 ]]
|
if [[ $? -ne 0 ]]
|
||||||
then
|
then
|
||||||
|
@ -214,6 +193,9 @@ for host in ${HAPY_SLV}; do
|
||||||
EchoVert " * Gestion des clés SSH"
|
EchoVert " * Gestion des clés SSH"
|
||||||
echo
|
echo
|
||||||
copy_ssh_id ${host}
|
copy_ssh_id ${host}
|
||||||
|
if [ $master = 2 ]; then
|
||||||
|
continue
|
||||||
|
fi
|
||||||
if [ $master = 0 ]; then
|
if [ $master = 0 ]; then
|
||||||
copy_files ${host}
|
copy_files ${host}
|
||||||
fi
|
fi
|
||||||
|
@ -230,12 +212,9 @@ for host in ${HAPY_SLV}; do
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
sync_nodes
|
|
||||||
if [[ ${HAPY_HA} != "oui" ]]
|
if [[ ${HAPY_HA} != "oui" ]]
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
then
|
then
|
||||||
>>>>>>> dcc8eeeecee5c5824e31c73b5ddf04590714f606
|
sync_nodes
|
||||||
wait_node_ok ${HAPY_SLV[${i}]}
|
wait_node_ok ${HAPY_SLV[${i}]}
|
||||||
if [[ ${?} -ne 0 ]]
|
if [[ ${?} -ne 0 ]]
|
||||||
then
|
then
|
||||||
|
|
|
@ -164,12 +164,12 @@ FEDERATION = [
|
||||||
]
|
]
|
||||||
|
|
||||||
RAFT = [
|
RAFT = [
|
||||||
LIMIT_PURGE = 100000,
|
LIMIT_PURGE = 1000,
|
||||||
LOG_RETENTION = 500000,
|
LOG_RETENTION = 5000,
|
||||||
LOG_PURGE_TIMEOUT = 600,
|
LOG_PURGE_TIMEOUT = 60,
|
||||||
ELECTION_TIMEOUT_MS = 2500,
|
ELECTION_TIMEOUT_MS = 2500,
|
||||||
BROADCAST_TIMEOUT_MS = 500,
|
BROADCAST_TIMEOUT_MS = 500,
|
||||||
XMLRPC_TIMEOUT_MS = 450
|
XMLRPC_TIMEOUT_MS = 5000
|
||||||
]
|
]
|
||||||
|
|
||||||
%if %%activer_one_ha == 'oui'
|
%if %%activer_one_ha == 'oui'
|
||||||
|
@ -241,12 +241,12 @@ DEFAULT_COST = [
|
||||||
# %% -- %
|
# %% -- %
|
||||||
#*******************************************************************************
|
#*******************************************************************************
|
||||||
|
|
||||||
#MAX_CONN = 15
|
MAX_CONN = %%one_max_conn
|
||||||
#MAX_CONN_BACKLOG = 15
|
MAX_CONN_BACKLOG = %%one_max_conn_backlog
|
||||||
#KEEPALIVE_TIMEOUT = 15
|
#KEEPALIVE_TIMEOUT = 15
|
||||||
#KEEPALIVE_MAX_CONN = 30
|
KEEPALIVE_MAX_CONN = %%one_keepalive_timeout
|
||||||
#TIMEOUT = 15
|
#TIMEOUT = 15
|
||||||
#RPC_LOG = NO
|
RPC_LOG = %%one_rpc_log
|
||||||
#MESSAGE_SIZE = 1073741824
|
#MESSAGE_SIZE = 1073741824
|
||||||
#LOG_CALL_FORMAT = "Req:%i UID:%u %m invoked %l20"
|
#LOG_CALL_FORMAT = "Req:%i UID:%u %m invoked %l20"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue