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:
commit
613a2f0e64
@ -52,7 +52,7 @@ class cloud::database::sql (
|
|||||||
$mysql_sys_maint_password = $os_params::mysql_sys_maint_password,
|
$mysql_sys_maint_password = $os_params::mysql_sys_maint_password,
|
||||||
$galera_clustercheck_dbuser = $os_params::galera_clustercheck_dbuser,
|
$galera_clustercheck_dbuser = $os_params::galera_clustercheck_dbuser,
|
||||||
$galera_clustercheck_dbpassword = $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'
|
include 'xinetd'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user