Skip to content

Commit c35a6d2

Browse files
AriaXLiAriaXLi
committed
(maint) puppet-lint top_scope_facts check
1 parent 8df3c03 commit c35a6d2

File tree

13 files changed

+64
-64
lines changed

13 files changed

+64
-64
lines changed

‎manifests/init.pp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,14 +197,14 @@
197197
$aio_upgrade_required = false
198198
$aio_downgrade_required = false
199199
} else {
200-
$aio_upgrade_required = versioncmp($::aio_agent_version, $_expected_package_version) < 0
201-
$aio_downgrade_required = versioncmp($::aio_agent_version, $_expected_package_version) > 0
200+
$aio_upgrade_required = versioncmp($facts['aio_agent_version'], $_expected_package_version) < 0
201+
$aio_downgrade_required = versioncmp($facts['aio_agent_version'], $_expected_package_version) > 0
202202
}
203203

204204
if $aio_upgrade_required {
205205
if any_resources_of_type('filebucket', { path => false }) {
206-
if $settings::digest_algorithm != $::puppet_digest_algorithm {
207-
fail("Remote filebuckets are enabled, but there was a agent/server digest algorithm mismatch. Server: ${settings::digest_algorithm}, agent: ${::puppet_digest_algorithm}. Either ensure the algorithms are matching, or disable remote filebuckets during the upgrade.")
206+
if $settings::digest_algorithm != $facts['puppet_digest_algorithm'] {
207+
fail("Remote filebuckets are enabled, but there was a agent/server digest algorithm mismatch. Server: ${settings::digest_algorithm}, agent: ${facts['puppet_digest_algorithm']}. Either ensure the algorithms are matching, or disable remote filebuckets during the upgrade.")
208208
}
209209
}
210210
}
@@ -236,7 +236,7 @@
236236
# - On Windows, services are handled by the puppet-agent MSI packages themselves.
237237
# ...but outside of PE, on other platforms, we must make sure the services are restarted. We do that with the
238238
# ::puppet_agent::service class. Make sure it's applied after the install process finishes if needed:
239-
if $facts['os']['family'] != 'windows' and (!$is_pe or versioncmp($::clientversion, '4.0.0') < 0) {
239+
if $facts['os']['family'] != 'windows' and (!$is_pe or versioncmp($facts['clientversion'], '4.0.0') < 0) {
240240
Class['puppet_agent::configure']
241241
~> contain('puppet_agent::service')
242242
}

‎manifests/install/darwin.pp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
assert_private()
1919
$install_script = 'osx_install.sh.erb'
2020

21-
$_logfile = "${::env_temp_variable}/osx_install.log"
21+
$_logfile = "${facts['env_temp_variable']}/osx_install.log"
2222
notice("Puppet install log file at ${_logfile}")
2323

24-
$_installsh = "${::env_temp_variable}/osx_install.sh"
24+
$_installsh = "${facts['env_temp_variable']}/osx_install.sh"
2525
file { $_installsh:
2626
ensure => file,
2727
mode => '0755',
2828
content => template('puppet_agent/do_install.sh.erb'),
2929
}
3030
-> exec { 'osx_install script':
31-
command => "${_installsh} ${::puppet_agent_pid} 2>&1 > ${_logfile} &",
31+
command => "${_installsh} ${facts['puppet_agent_pid']} 2>&1 > ${_logfile} &",
3232
}
3333
}

‎manifests/install/solaris.pp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@
3333
# Puppet 5.0 adds this, but some i18n implementation is loading code fairly late and appears
3434
# to be messing up the upgrade.
3535

36-
if $::puppet_agent::aio_upgrade_required {
37-
$_logfile = "${::env_temp_variable}/solaris_install.log"
36+
if $puppet_agent::aio_upgrade_required {
37+
$_logfile = "${facts['env_temp_variable']}/solaris_install.log"
3838
notice ("Puppet install log file at ${_logfile}")
3939

40-
$_installsh = "${::env_temp_variable}/solaris_install.sh"
40+
$_installsh = "${facts['env_temp_variable']}/solaris_install.sh"
4141
file { $_installsh:
4242
ensure => file,
4343
mode => '0755',
4444
content => template('puppet_agent/do_install.sh.erb'),
4545
}
4646
-> exec { 'solaris_install script':
47-
command => "/usr/bin/ctrun -l none ${_installsh} ${::puppet_agent_pid} 2>&1 > ${_logfile} &",
47+
command => "/usr/bin/ctrun -l none ${_installsh} ${facts['puppet_agent_pid']} 2>&1 > ${_logfile} &",
4848
}
4949
}
5050
} else {

‎manifests/install/windows.pp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,25 +58,25 @@
5858
}
5959

6060
$_timestamp = strftime('%Y_%m_%d-%H_%M')
61-
$_logfile = windows_native_path("${::env_temp_variable}/puppet-${_timestamp}-installer.log")
61+
$_logfile = windows_native_path("${facts['env_temp_variable']}/puppet-${_timestamp}-installer.log")
6262

6363
notice ("Puppet upgrade log file at ${_logfile}")
6464
debug ("Installing puppet from ${_msi_location}")
6565

66-
$_helpers = windows_native_path("${::env_temp_variable}/helpers.ps1")
66+
$_helpers = windows_native_path("${facts['env_temp_variable']}/helpers.ps1")
6767
file { $_helpers:
6868
ensure => file,
6969
content => file('puppet_agent/helpers.ps1'),
7070
}
7171

72-
$_installps1 = windows_native_path("${::env_temp_variable}/install_puppet.ps1")
72+
$_installps1 = windows_native_path("${facts['env_temp_variable']}/install_puppet.ps1")
7373
puppet_agent_upgrade_error { 'puppet_agent_upgrade_failure.log': }
7474
file { $_installps1:
7575
ensure => file,
7676
content => file('puppet_agent/install_puppet.ps1'),
7777
}
7878

79-
$_prerequisites_check = windows_native_path("${::env_temp_variable}/prerequisites_check.ps1")
79+
$_prerequisites_check = windows_native_path("${facts['env_temp_variable']}/prerequisites_check.ps1")
8080
file { $_prerequisites_check:
8181
ensure => file,
8282
content => file('puppet_agent/prerequisites_check.ps1'),
@@ -103,11 +103,11 @@
103103
-NoLogo \
104104
-NonInteractive \
105105
-Command ${_installps1} \
106-
-PuppetPID ${::puppet_agent_pid} \
106+
-PuppetPID ${facts['puppet_agent_pid']} \
107107
-Source '${_msi_location}' \
108108
-Logfile '${_logfile}' \
109109
-InstallDir '${install_dir}' \
110-
-PuppetMaster '${::puppet_master_server}' \
110+
-PuppetMaster '${facts['puppet_master_server']}' \
111111
-PuppetStartType '${_agent_startup_mode}' \
112112
-InstallArgs '${_install_options}' \
113113
${_move_dll_workaround} \
@@ -123,7 +123,7 @@
123123
exit 0; \
124124
} \
125125
exit 1; }.Invoke()",
126-
path => $::path,
126+
path => $facts['path'],
127127
require => [
128128
Puppet_agent_upgrade_error['puppet_agent_upgrade_failure.log'],
129129
File[$_installps1],
@@ -134,8 +134,8 @@
134134

135135
# PUP-5480/PE-15037 Cache dir loses inheritable SYSTEM perms
136136
exec { 'fix inheritable SYSTEM perms':
137-
command => "${facts['os']['windows']['system32']}\\icacls.exe \"${::puppet_client_datadir}\" /grant \"SYSTEM:(OI)(CI)(F)\"",
138-
unless => "${facts['os']['windows']['system32']}\\cmd.exe /c ${facts['os']['windows']['system32']}\\icacls.exe \"${::puppet_client_datadir}\" | findstr \"SYSTEM:(OI)(CI)(F)\"",
137+
command => "${facts['os']['windows']['system32']}\\icacls.exe \"${facts['puppet_client_datadir']}\" /grant \"SYSTEM:(OI)(CI)(F)\"",
138+
unless => "${facts['os']['windows']['system32']}\\cmd.exe /c ${facts['os']['windows']['system32']}\\icacls.exe \"${facts['puppet_client_datadir']}\" | findstr \"SYSTEM:(OI)(CI)(F)\"",
139139
require => Exec['install_puppet.ps1'],
140140
}
141141
}

‎manifests/osfamily/aix.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#
3434
# The following will update the aix_ver_number variable to identify which package to install based
3535
# on puppet collection, package version and AIX version.
36-
$_aix_ver_number = regsubst($::platform_tag,'aix-(\d+\.\d+)-power','\1')
36+
$_aix_ver_number = regsubst($facts['platform_tag'],'aix-(\d+\.\d+)-power','\1')
3737
if $_aix_ver_number {
3838
if $::puppet_agent::collection =~ /^puppet8/ {
3939
$aix_ver_number = '7.2'

‎manifests/osfamily/darwin.pp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
$source = $::puppet_agent::absolute_source
1414
} elsif ($::puppet_agent::is_pe and (!$::puppet_agent::use_alternate_sources)) {
1515
$pe_server_version = pe_build_version()
16-
if $::puppet_agent::alternate_pe_source {
17-
$source = "${::puppet_agent::alternate_pe_source}/packages/${pe_server_version}/${::platform_tag}/${puppet_agent::package_name}-${::puppet_agent::prepare::package_version}-1.osx${$productversion_major}.dmg"
18-
} elsif $::puppet_agent::source {
19-
$source = "${::puppet_agent::source}/packages/${pe_server_version}/${::platform_tag}/${puppet_agent::package_name}-${::puppet_agent::prepare::package_version}-1.osx${$productversion_major}.dmg"
16+
if $puppet_agent::alternate_pe_source {
17+
$source = "${puppet_agent::alternate_pe_source}/packages/${pe_server_version}/${facts['platform_tag']}/${puppet_agent::package_name}-${puppet_agent::prepare::package_version}-1.osx${$productversion_major}.dmg"
18+
} elsif $puppet_agent::source {
19+
$source = "${puppet_agent::source}/packages/${pe_server_version}/${facts['platform_tag']}/${puppet_agent::package_name}-${puppet_agent::prepare::package_version}-1.osx${$productversion_major}.dmg"
2020
} else {
21-
$source = "puppet:///pe_packages/${pe_server_version}/${::platform_tag}/${puppet_agent::package_name}-${::puppet_agent::prepare::package_version}-1.osx${$productversion_major}.dmg"
21+
$source = "puppet:///modules/pe_packages/${pe_server_version}/${facts['platform_tag']}/${puppet_agent::package_name}-${puppet_agent::prepare::package_version}-1.osx${$productversion_major}.dmg"
2222
}
2323
} else {
2424
$source = "${::puppet_agent::mac_source}/mac/${::puppet_agent::collection}/${productversion_major}/${::puppet_agent::arch}/${puppet_agent::package_name}-${::puppet_agent::prepare::package_version}-1.osx${$productversion_major}.dmg"

‎manifests/osfamily/debian.pp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
include ::apt
1717
if ($::puppet_agent::is_pe and (!$::puppet_agent::use_alternate_sources)) {
1818
$pe_server_version = pe_build_version()
19-
if $::puppet_agent::source {
20-
$source = "${::puppet_agent::source}/packages/${pe_server_version}/${::platform_tag}"
21-
} elsif $::puppet_agent::alternate_pe_source {
22-
$source = "${::puppet_agent::alternate_pe_source}/packages/${pe_server_version}/${::platform_tag}"
19+
if $puppet_agent::source {
20+
$source = "${puppet_agent::source}/packages/${pe_server_version}/${facts['platform_tag']}"
21+
} elsif $puppet_agent::alternate_pe_source {
22+
$source = "${puppet_agent::alternate_pe_source}/packages/${pe_server_version}/${facts['platform_tag']}"
2323
} else {
24-
$source = "https://${::puppet_master_server}:8140/packages/${pe_server_version}/${::platform_tag}"
24+
$source = "https://${facts['puppet_master_server']}:8140/packages/${pe_server_version}/${facts['platform_tag']}"
2525
}
2626
# In Puppet Enterprise, agent packages are served by the same server
2727
# as the master, which can be using either a self signed CA, or an external CA.
@@ -31,8 +31,8 @@
3131
# happen to be the default in PE already.
3232
$_ssl_dir = $::puppet_agent::params::ssldir
3333
$_sslcacert_path = "${_ssl_dir}/certs/ca.pem"
34-
$_sslclientcert_path = "${_ssl_dir}/certs/${::clientcert}.pem"
35-
$_sslclientkey_path = "${_ssl_dir}/private_keys/${::clientcert}.pem"
34+
$_sslclientcert_path = "${_ssl_dir}/certs/${facts['clientcert']}.pem"
35+
$_sslclientkey_path = "${_ssl_dir}/private_keys/${facts['clientcert']}.pem"
3636

3737
# For debian based platforms, in order to add SSL verification, you need to add a
3838
# configuration file specific to just the sources host

‎manifests/osfamily/redhat.pp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
# Treat Amazon Linux just like Enterprise Linux
3636
$pe_repo_dir = ($facts['os']['name'] == 'Amazon') ? {
3737
true => "el-${amz_el_version}-${facts['os']['architecture']}",
38-
default => $::platform_tag,
38+
default => $facts['platform_tag'],
3939
}
4040
if $::puppet_agent::source {
4141
$source = "${::puppet_agent::source}/packages/${pe_server_version}/${pe_repo_dir}"
4242
} elsif $::puppet_agent::alternate_pe_source {
4343
$source = "${::puppet_agent::alternate_pe_source}/packages/${pe_server_version}/${pe_repo_dir}"
4444
} else {
45-
$source = "https://${::puppet_master_server}:8140/packages/${pe_server_version}/${pe_repo_dir}"
45+
$source = "https://${facts['puppet_master_server']}:8140/packages/${pe_server_version}/${pe_repo_dir}"
4646
}
4747
} else {
4848
if $::puppet_agent::collection == 'PC1' {
@@ -62,8 +62,8 @@
6262

6363
$_ssl_dir = $::puppet_agent::params::ssldir
6464
$_sslcacert_path = "${_ssl_dir}/certs/ca.pem"
65-
$_sslclientcert_path = "${_ssl_dir}/certs/${::clientcert}.pem"
66-
$_sslclientkey_path = "${_ssl_dir}/private_keys/${::clientcert}.pem"
65+
$_sslclientcert_path = "${_ssl_dir}/certs/${facts['clientcert']}.pem"
66+
$_sslclientkey_path = "${_ssl_dir}/private_keys/${facts['clientcert']}.pem"
6767
# Due to the file paths changing on the PE Master, the 3.8 repository is no longer valid.
6868
# On upgrade, remove the repo file so that a dangling reference is not left behind returning
6969
# a 404 on subsequent runs.

‎manifests/osfamily/solaris.pp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
}
1212

1313
$pe_server_version = pe_build_version()
14-
if $::puppet_agent::absolute_source {
15-
$source_dir = $::puppet_agent::absolute_source
16-
} elsif $::puppet_agent::alternate_pe_source {
17-
$source_dir = "${::puppet_agent::alternate_pe_source}/packages/${pe_server_version}/${::platform_tag}"
18-
} elsif $::puppet_agent::source {
19-
$source_dir = "${::puppet_agent::source}/packages/${pe_server_version}/${::platform_tag}"
14+
if $puppet_agent::absolute_source {
15+
$source_dir = $puppet_agent::absolute_source
16+
} elsif $puppet_agent::alternate_pe_source {
17+
$source_dir = "${puppet_agent::alternate_pe_source}/packages/${pe_server_version}/${facts['platform_tag']}"
18+
} elsif $puppet_agent::source {
19+
$source_dir = "${puppet_agent::source}/packages/${pe_server_version}/${facts['platform_tag']}"
2020
} else {
21-
$source_dir = "${::puppet_agent::solaris_source}/${pe_server_version}/${::platform_tag}"
21+
$source_dir = "${puppet_agent::solaris_source}/${pe_server_version}/${facts['platform_tag']}"
2222
}
2323

2424
$pkg_arch = $::puppet_agent::arch ? {
@@ -53,7 +53,7 @@
5353
owner => 0,
5454
group => 0,
5555
mode => '0644',
56-
source => "puppet:///pe_packages/${pe_server_version}/${::platform_tag}/solaris-noask",
56+
source => "puppet:///modules/pe_packages/${pe_server_version}/${facts['platform_tag']}/solaris-noask",
5757
}
5858
}
5959
'11': {

‎manifests/osfamily/suse.pp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121

2222
# SLES 11 in PE can no longer install agents from pe_repo
2323
if $facts['os']['release']['major'] == '11' {
24-
if $::puppet_agent::source {
25-
$source = "${::puppet_agent::source}/packages/${pe_server_version}/${::platform_tag}"
26-
} elsif $::puppet_agent::alternate_pe_source {
27-
$source = "${::puppet_agent::alternate_pe_source}/packages/${pe_server_version}/${::platform_tag}"
24+
if $puppet_agent::source {
25+
$source = "${puppet_agent::source}/packages/${pe_server_version}/${facts['platform_tag']}"
26+
} elsif $puppet_agent::alternate_pe_source {
27+
$source = "${puppet_agent::alternate_pe_source}/packages/${pe_server_version}/${facts['platform_tag']}"
2828
} else {
29-
$source = "puppet:///pe_packages/${pe_server_version}/${::platform_tag}/${::puppet_agent::package_name}-${::puppet_agent::prepare::package_version}-1.sles11.${::puppet_agent::arch}.rpm"
29+
$source = "puppet:///modules/pe_packages/${pe_server_version}/${facts['platform_tag']}/${puppet_agent::package_name}-${puppet_agent::prepare::package_version}-1.sles11.${puppet_agent::arch}.rpm"
3030
}
3131

3232
# Nuke the repo if it exists to ensure zypper doesn't remain broken
@@ -39,12 +39,12 @@
3939
}
4040
contain puppet_agent::prepare::package
4141
} else {
42-
if $::puppet_agent::source {
43-
$source = "${::puppet_agent::source}/packages/${pe_server_version}/${::platform_tag}"
44-
} elsif $::puppet_agent::alternate_pe_source {
45-
$source = "${::puppet_agent::alternate_pe_source}/packages/${pe_server_version}/${::platform_tag}"
42+
if $puppet_agent::source {
43+
$source = "${puppet_agent::source}/packages/${pe_server_version}/${facts['platform_tag']}"
44+
} elsif $puppet_agent::alternate_pe_source {
45+
$source = "${puppet_agent::alternate_pe_source}/packages/${pe_server_version}/${facts['platform_tag']}"
4646
} else {
47-
$source = "https://${::puppet_master_server}:8140/packages/${pe_server_version}/${::platform_tag}"
47+
$source = "https://${facts['puppet_master_server']}:8140/packages/${pe_server_version}/${facts['platform_tag']}"
4848
}
4949
}
5050
} else {

0 commit comments

Comments
 (0)