File tree 1 file changed +8
-2
lines changed
1 file changed +8
-2
lines changed Original file line number Diff line number Diff line change 53
53
Enum['absent', 'present'] $ensure = ' present' ,
54
54
$import_timeout = 300,
55
55
$import_cat_cmd = ' cat' ,
56
- $mysql_exec_path = $mysql::params::exec_path ,
56
+ $mysql_exec_path = undef ,
57
57
) {
58
58
$table = " ${dbname} .*"
59
59
60
60
$sql_inputs = join([$sql ], ' ' )
61
61
62
62
include 'mysql::client'
63
63
64
+ if ($mysql_exec_path ) {
65
+ $_mysql_exec_path = $mysql_exec_path
66
+ } else {
67
+ $_mysql_exec_path = $mysql::params::exec_path
68
+ }
69
+
64
70
$db_resource = {
65
71
ensure => $ensure ,
66
72
charset => $charset ,
98
104
logoutput => true ,
99
105
environment => " HOME=${::root_home} " ,
100
106
refreshonly => $refresh ,
101
- path => " /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:${mysql_exec_path } " ,
107
+ path => " /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:${_mysql_exec_path }" ,
102
108
require => Mysql_grant[" ${user} @${host} /${table} " ],
103
109
subscribe => Mysql_database[$dbname ],
104
110
timeout => $import_timeout ,
You can’t perform that action at this time.
0 commit comments