Cadoles
/
eole-one-master
20
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into dist/eole/2.7.0/develop

This commit is contained in:
vincent 2019-02-20 16:03:34 +01:00
parent 8e742fc88b 171328c890
commit e33bb76a2a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dicos/29_one-master.xml
View File

@ -9,6 +9,7 @@
<file filelist='onesinglenode' name='/etc/one/auth/ldap_auth.conf'/> <file filelist='onesinglenode' name='/etc/one/auth/ldap_auth.conf'/>
<service>opennebula</service> <service>opennebula</service>
<service>opennebula-scheduler</service>
<service_access service='one-ssh'> <service_access service='one-ssh'>
<tcpwrapper>sshd</tcpwrapper> <tcpwrapper>sshd</tcpwrapper>
@ -52,6 +53,7 @@
<value>one</value> <value>one</value>
</variable> </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_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 --> <!-- VNETS -->
<variable name='vnet_pilote' type='string' description='Pilote utilisé pour le réseau virtuel' hidden='True' /> <variable name='vnet_pilote' type='string' description='Pilote utilisé pour le réseau virtuel' hidden='True' />

6
tmpl/oned.conf
View File

@ -78,9 +78,7 @@ SCRIPTS_REMOTE_DIR=/var/tmp/one
PORT = 2633 PORT = 2633
%if %%enable_one_ha == 'oui' %if %%enable_one_ha == 'non'
LISTEN_ADDRESS = %%adresse_ip_eth0
%else
LISTEN_ADDRESS = "127.0.0.1" LISTEN_ADDRESS = "127.0.0.1"
%end if %end if
@ -94,7 +92,7 @@ DB = [ BACKEND = "mysql",
USER = "%%one_database_user", USER = "%%one_database_user",
PASSWD = "%%one_database_pass", PASSWD = "%%one_database_pass",
DB_NAME = "%%one_database_name", DB_NAME = "%%one_database_name",
CONNECTIONS = 50 ] CONNECTIONS = %%one_database_connections ]
%end if %end if
VNC_PORTS = [ VNC_PORTS = [