This repository was archived by the owner on May 5, 2023. It is now read-only.
File tree 5 files changed +8
-8
lines changed
5 files changed +8
-8
lines changed Original file line number Diff line number Diff line change 70
70
}
71
71
72
72
if $strip {
73
- if $::osfamily == ' Solaris' or $name !~ /(.tar|.tgz|.tar.gz|.tbz2|.tar.bz2)$/ {
73
+ if $facts [ ' os ' ][ ' family ' ] == ' Solaris' or $name !~ /(.tar|.tgz|.tar.gz|.tbz2|.tar.bz2)$/ {
74
74
warning (' strip is only supported with GNU tar, ignoring the parameter' )
75
75
$strip_opt = ' '
76
76
} else {
92
92
}
93
93
94
94
/(.tgz|.tar.gz)$/: {
95
- if $::osfamily == ' Solaris' {
95
+ if $facts [ ' os ' ][ ' family ' ] == ' Solaris' {
96
96
$command = " gunzip -dc < ${source_path} | tar xf - ${untar_opts_real} "
97
97
} else {
98
98
$command = " tar xzf ${source_path}${strip_opt}${untar_opts_real} "
116
116
}
117
117
118
118
/.deb$/: {
119
- if $::osfamily == ' Debian' {
119
+ if $facts [ ' os ' ][ ' family ' ] == ' Debian' {
120
120
$command = " dpkg --extract ${source_path} ."
121
121
} else {
122
122
fail(' The .deb filetype is only supported on Debian family systems.' )
Original file line number Diff line number Diff line change 1
1
# OS specific parameters
2
2
class staging::params {
3
- case $::osfamily {
3
+ case $facts [ ' os ' ][ ' family ' ] {
4
4
default: {
5
5
$path = ' /opt/staging'
6
6
$owner = ' 0'
Original file line number Diff line number Diff line change 3
3
let ( :facts ) do
4
4
{
5
5
caller_module_name : '' ,
6
- osfamily : 'RedHat' ,
6
+ os : { family : 'RedHat' } ,
7
7
staging_http_get : 'curl' ,
8
8
path : '/usr/local/bin:/usr/bin:/bin'
9
9
}
Original file line number Diff line number Diff line change 3
3
# forcing a more sane caller_module_name to match real usage.
4
4
let ( :facts ) do
5
5
{
6
- osfamily : 'RedHat' ,
6
+ os : { family : 'RedHat' } ,
7
7
path : '/usr/local/bin:/usr/bin:/bin'
8
8
}
9
9
end
200
200
describe 'when deploying deb on a Debian family system' do
201
201
let ( :facts ) do
202
202
{
203
- osfamily : 'Debian' ,
203
+ os : { family : 'Debian' } ,
204
204
path : '/usr/local/bin:/usr/bin:/bin'
205
205
}
206
206
end
Original file line number Diff line number Diff line change 3
3
# forcing a more sane caller_module_name to match real usage.
4
4
let ( :facts ) do
5
5
{
6
- osfamily : 'RedHat' ,
6
+ os : { family : 'RedHat' } ,
7
7
staging_http_get : 'curl' ,
8
8
puppetversion : Puppet . version
9
9
}
You can’t perform that action at this time.
0 commit comments