From 4bc36ce4eec7ae57c35202c34034ecca60215caf Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Wed, 20 Feb 2019 15:47:11 +0100
Subject: [PATCH 1/3] =?UTF-8?q?templatise=20le=20nombre=20de=20connexion?=
 =?UTF-8?q?=20=C3=A0=20la=20base=20de=20donn=C3=A9es=20+=20gestion=20du=20?=
 =?UTF-8?q?service=20opennebula-scheduler?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dicos/29_one-master.xml | 2 ++
 tmpl/oned.conf          | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dicos/29_one-master.xml b/dicos/29_one-master.xml
index 3b328d7..9c2b79d 100644
--- a/dicos/29_one-master.xml
+++ b/dicos/29_one-master.xml
@@ -9,6 +9,7 @@
         <file filelist='onesinglenode' name='/etc/one/auth/ldap_auth.conf'/>
 
         <service>opennebula</service>
+        <service>opennebula-scheduler</service>
 
         <service_access service='one-ssh'>
             <tcpwrapper>sshd</tcpwrapper>
@@ -52,6 +53,7 @@
                 <value>one</value>
             </variable>
             <variable name="one_database_pass" description="Mot de passe pour se connecter à la base de données" type="password" mandatory="True"/>
+	    <variable name="one_database_connections" description="Nombre de connection à la base de données" type="number" mandatory="True" mode="expert"/><value>50</value></variable>
 
             <!-- VNETS -->
             <variable name='vnet_pilote' type='string'  description='Pilote utilisé pour le réseau virtuel' hidden='True' />
diff --git a/tmpl/oned.conf b/tmpl/oned.conf
index e66ce4c..c3ee118 100644
--- a/tmpl/oned.conf
+++ b/tmpl/oned.conf
@@ -94,7 +94,7 @@ DB = [ BACKEND = "mysql",
        USER    = "%%one_database_user",
        PASSWD  = "%%one_database_pass",
        DB_NAME = "%%one_database_name",
-       CONNECTIONS = 50 ]
+       CONNECTIONS = %%one_database_connections ]
 %end if
 
 VNC_PORTS = [

From 7fc554a7ace906872021e22f082e21d8609ac70f Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Wed, 20 Feb 2019 15:53:05 +0100
Subject: [PATCH 2/3] fixe

---
 dicos/29_one-master.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dicos/29_one-master.xml b/dicos/29_one-master.xml
index 9c2b79d..560e048 100644
--- a/dicos/29_one-master.xml
+++ b/dicos/29_one-master.xml
@@ -53,7 +53,7 @@
                 <value>one</value>
             </variable>
             <variable name="one_database_pass" description="Mot de passe pour se connecter à la base de données" type="password" mandatory="True"/>
-	    <variable name="one_database_connections" description="Nombre de connection à la base de données" type="number" mandatory="True" mode="expert"/><value>50</value></variable>
+	    <variable name="one_database_connections" description="Nombre de connection à la base de données" type="number" mandatory="True" mode="expert"><value>50</value></variable>
 
             <!-- VNETS -->
             <variable name='vnet_pilote' type='string'  description='Pilote utilisé pour le réseau virtuel' hidden='True' />

From 171328c8908d1930f21b91fe9908b3d18c099ba5 Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Wed, 20 Feb 2019 15:58:49 +0100
Subject: [PATCH 3/3] =?UTF-8?q?si=20enable=5Fone=5Fha=20est=20=C3=A0=20oui?=
 =?UTF-8?q?,=20RPC=20ecoute=20sur=20toutes=20les=20interfaces=20(dont=20lo?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tmpl/oned.conf | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tmpl/oned.conf b/tmpl/oned.conf
index c3ee118..bf606a6 100644
--- a/tmpl/oned.conf
+++ b/tmpl/oned.conf
@@ -78,9 +78,7 @@ SCRIPTS_REMOTE_DIR=/var/tmp/one
 
 PORT = 2633
 
-%if %%enable_one_ha == 'oui'
-LISTEN_ADDRESS = %%adresse_ip_eth0
-%else
+%if %%enable_one_ha == 'non'
 LISTEN_ADDRESS = "127.0.0.1"
 %end if