File tree 5 files changed +6
-9
lines changed
5 files changed +6
-9
lines changed Original file line number Diff line number Diff line change 1
1
--relative
2
- --no-top_scope_facts-check
3
2
--no-anchor_resource-check
4
3
--no-params_empty_string_assignment-check
Original file line number Diff line number Diff line change @@ -36,6 +36,5 @@ Rakefile:
36
36
changelog_since_tag : ' v11.0.3'
37
37
Rakefile :
38
38
extra_disabled_lint_checks :
39
- - top_scope_facts
40
39
- anchor_resource
41
40
- params_empty_string_assignment
Original file line number Diff line number Diff line change @@ -42,7 +42,6 @@ def changelog_future_release
42
42
end
43
43
44
44
PuppetLint . configuration . send ( 'disable_relative' )
45
- PuppetLint . configuration . send ( 'disable_top_scope_facts' )
46
45
PuppetLint . configuration . send ( 'disable_anchor_resource' )
47
46
PuppetLint . configuration . send ( 'disable_params_empty_string_assignment' )
48
47
Original file line number Diff line number Diff line change 126
126
exec { "${dbname}-import" :
127
127
command => " ${import_cat_cmd} ${shell_join($sql )} | mysql ${dbname} " ,
128
128
logoutput => true ,
129
- environment => " HOME=${:: root_home} " ,
129
+ environment => " HOME=${facts[' root_home'] }" ,
130
130
refreshonly => ! $enforce_sql ,
131
131
path => " /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:${_mysql_exec_path}" ,
132
132
require => Mysql_grant[" ${user} @${host} /${table} " ],
Original file line number Diff line number Diff line change 39
39
40
40
if $mysql::server::create_root_my_cnf and $root_password_set {
41
41
# TODO: use EPP instead of ERB, as EPP can handle Data of Type Sensitive without further ado
42
- file { "${:: root_home}/.my.cnf" :
42
+ file { "${facts[' root_home'] }/.my.cnf" :
43
43
content => template (' mysql/my.cnf.pass.erb' ),
44
44
owner => ' root' ,
45
45
mode => ' 0600' ,
46
46
}
47
47
48
48
# show_diff was added with puppet 3.0
49
- if versioncmp($:: puppetversion , ' 3.0' ) >= 0 {
50
- File [" ${:: root_home} /.my.cnf" ] { show_diff => false }
49
+ if versioncmp($facts [ ' puppetversion' ] , ' 3.0' ) >= 0 {
50
+ File [" ${facts[' root_home'] }/.my.cnf" ] { show_diff => false }
51
51
}
52
52
if $mysql::server::create_root_user {
53
- Mysql_user[' root@localhost' ] -> File [" ${:: root_home} /.my.cnf" ]
53
+ Mysql_user[' root@localhost' ] -> File [" ${facts[' root_home'] }/.my.cnf" ]
54
54
}
55
55
}
56
56
57
57
if $mysql::server::create_root_login_file and $root_password_set {
58
- file { "${:: root_home}/.mylogin.cnf" :
58
+ file { "${facts[' root_home'] }/.mylogin.cnf" :
59
59
source => $login_file ,
60
60
owner => ' root' ,
61
61
mode => ' 0600' ,
You can’t perform that action at this time.
0 commit comments