Skip to content

Commit 21e9202

Browse files
committed
top-scope facts
1 parent 5131e0f commit 21e9202

File tree

5 files changed

+4
-7
lines changed

5 files changed

+4
-7
lines changed

.puppet-lint.rc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
--relative
2-
--no-top_scope_facts-check
32
--no-anchor_resource-check
43
--no-params_empty_string_assignment-check

.sync.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,5 @@ Rakefile:
3636
changelog_since_tag: 'v11.0.3'
3737
Rakefile:
3838
extra_disabled_lint_checks:
39-
- top_scope_facts
4039
- anchor_resource
4140
- params_empty_string_assignment

Rakefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ def changelog_future_release
4242
end
4343

4444
PuppetLint.configuration.send('disable_relative')
45-
PuppetLint.configuration.send('disable_top_scope_facts')
4645
PuppetLint.configuration.send('disable_anchor_resource')
4746
PuppetLint.configuration.send('disable_params_empty_string_assignment')
4847

manifests/db.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
exec { "${dbname}-import":
127127
command => "${import_cat_cmd} ${shell_join($sql)} | mysql ${dbname}",
128128
logoutput => true,
129-
environment => "HOME=${::root_home}",
129+
environment => "HOME=${facts['root_home']}",
130130
refreshonly => ! $enforce_sql,
131131
path => "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:${_mysql_exec_path}",
132132
require => Mysql_grant["${user}@${host}/${table}"],

manifests/server/root_password.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,18 @@
3939

4040
if $mysql::server::create_root_my_cnf and $root_password_set {
4141
# 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":
4343
content => template('mysql/my.cnf.pass.erb'),
4444
owner => 'root',
4545
mode => '0600',
4646
}
4747

4848
# show_diff was added with puppet 3.0
4949
if versioncmp($::puppetversion, '3.0') >= 0 {
50-
File["${::root_home}/.my.cnf"] { show_diff => false }
50+
File["${facts['root_home']}/.my.cnf"] { show_diff => false }
5151
}
5252
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"]
5454
}
5555
}
5656

0 commit comments

Comments
 (0)