File tree 5 files changed +5
-5
lines changed
5 files changed +5
-5
lines changed Original file line number Diff line number Diff line change 66
66
ensure => absent ,
67
67
priority => ' 90' ,
68
68
}
69
- } elsif $puppet_agent::collection =~ /core/ {
69
+ } elsif $puppet_agent::collection and $puppet_agent::collection =~ /core/ {
70
70
$source = ' https://apt-puppetcore.puppet.com'
71
71
} else {
72
72
$source = $puppet_agent::apt_source
Original file line number Diff line number Diff line change 60
60
} else {
61
61
if $puppet_agent::collection == ' PC1' {
62
62
$source = " ${puppet_agent::yum_source} /${platform_and_version} /${puppet_agent::collection} /${puppet_agent::arch} "
63
- } elsif $puppet_agent::collection =~ /core/ {
63
+ } elsif $puppet_agent::collection and $puppet_agent::collection =~ /core/ {
64
64
$_collection = regsubst($puppet_agent::collection , /core/, ' ' )
65
65
$source = " https://yum-puppetcore.puppet.com/${_collection}/${platform_and_version} /${puppet_agent::arch} "
66
66
} else {
Original file line number Diff line number Diff line change 50
50
} else {
51
51
if $puppet_agent::collection == ' PC1' {
52
52
$source = " ${puppet_agent::yum_source} /sles/${facts['os']['release']['major']}/${puppet_agent::collection} /${puppet_agent::arch} "
53
- } elsif $puppet_agent::collection =~ /core/ {
53
+ } elsif $puppet_agent::collection and $puppet_agent::collection =~ /core/ {
54
54
$_collection = regsubst($puppet_agent::collection , /core/, ' ' )
55
55
$source = " https://yum-puppetcore.puppet.com/${_collection}/sles/${facts['os']['release']['major']}/${puppet_agent::arch} "
56
56
} else {
Original file line number Diff line number Diff line change 25
25
} else {
26
26
if $puppet_agent::collection == ' PC1' {
27
27
$source = " ${puppet_agent::windows_source} /windows/${puppet_agent::package_name} -${puppet_agent::prepare::package_version} -${puppet_agent::arch} .msi"
28
- } elsif $puppet_agent::collection =~ /core/ {
28
+ } elsif $puppet_agent::collection and $puppet_agent::collection =~ /core/ {
29
29
$source = ' https://artifacts-puppetcore.puppet.com/v1/download'
30
30
$destination_name = " ${puppet_agent::package_name} -${puppet_agent::prepare::package_version} -${puppet_agent::arch} .msi"
31
31
} else {
Original file line number Diff line number Diff line change 38
38
$mode = ' 0644'
39
39
}
40
40
41
- if $puppet_agent::collection =~ /core/ and $facts [' os' ][' family' ] =~ /windows/ {
41
+ if $puppet_agent::collection and $puppet_agent::collection =~ /core/ and $facts [' os' ][' family' ] =~ /windows/ {
42
42
$download_username = getvar(' puppet_agent::username' , ' forge-key' )
43
43
$download_password = unwrap(getvar(' puppet_agent::password' ))
44
44
You can’t perform that action at this time.
0 commit comments