Skip to content

Commit e34eac0

Browse files
committed
(MODULES-1700) Change the filebucketing behavior so static_compiler can handle them
1 parent a0942af commit e34eac0

5 files changed

Lines changed: 6 additions & 13 deletions

File tree

manifests/fragment.pp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
if $backup {
5858
warning('The $backup parameter to concat::fragment is deprecated and has no effect')
5959
}
60+
$my_backup = concat_getparam(Concat[$target], 'backup')
6061
if $ensure == undef {
6162
$my_ensure = concat_getparam(Concat[$target], 'ensure')
6263
} else {
@@ -118,7 +119,7 @@
118119
mode => $fragmode,
119120
source => $source,
120121
content => $content,
121-
backup => false,
122+
backup => $my_backup,
122123
replace => true,
123124
alias => "concat_fragment_${name}",
124125
notify => Exec["concat_${target}"]

manifests/setup.pp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@
4747
default => $script_path
4848
}
4949

50-
File {
51-
backup => false,
52-
}
53-
5450
file { $script_path:
5551
ensure => file,
5652
owner => $default_owner,
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
HOSTS:
2-
centos-64-x64:
2+
centos-66-x64:
33
roles:
44
- master
55
platform: el-6-x86_64
6-
box : centos-64-x64-vbox4210-nocm
7-
box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
6+
box : puppetlabs/centos-6.6-64-nocm
7+
box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-6.6-64-nocm
88
hypervisor : vagrant
99
CONFIG:
1010
type: git

spec/unit/classes/concat_setup_spec.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
:owner => 'root',
2222
:group => 0,
2323
:source => 'puppet:///modules/concat/concatfragments.rb',
24-
:backup => false,
2524
})
2625
end
2726

@@ -32,7 +31,6 @@
3231
:mode => '0755',
3332
:owner => 'root',
3433
:group => 0,
35-
:backup => false,
3634
})
3735
end
3836
end
@@ -71,7 +69,6 @@
7169
:group => 0,
7270
:mode => '0755',
7371
:source => 'puppet:///modules/concat/concatfragments.rb',
74-
:backup => false,
7572
})
7673
end
7774
end # on osfamily Solaris
@@ -95,7 +92,6 @@
9592
:group => nil,
9693
:mode => nil,
9794
:source => 'puppet:///modules/concat/concatfragments.rb',
98-
:backup => false,
9995
})
10096
end
10197
end # on osfamily windows

spec/unit/defines/concat_fragment_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
:source => p[:source],
5252
:content => p[:content],
5353
:alias => "concat_fragment_#{title}",
54-
:backup => false,
54+
:backup => 'puppet',
5555
})
5656
end
5757
end

0 commit comments

Comments
 (0)