Merge branch 'master' into bug/179/leseb

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>

Conflicts:
	manifests/database/sql.pp
This commit is contained in:
Emilien Macchi 2014-02-07 18:37:52 +01:00
commit 613a2f0e64

View File

@ -52,7 +52,7 @@ class cloud::database::sql (
$mysql_sys_maint_password = $os_params::mysql_sys_maint_password,
$galera_clustercheck_dbuser = $os_params::galera_clustercheck_dbuser,
$galera_clustercheck_dbpassword = $os_params::galera_clustercheck_dbuser,
$galera_clustercheck_ipaddress = $os_params::internal_netif_ip,
$galera_clustercheck_ipaddress = $os_params::internal_netif_ip
) {
include 'xinetd'