Skip to content

Commit

Permalink
Merge pull request #288 from woneill/ticket/MODULES-1700-backup_files…
Browse files Browse the repository at this point in the history
…_for_static_compiler

(MODULES-1700) Change the filebucketing behavior so static_compiler can ...
  • Loading branch information
hunner committed Apr 7, 2015
2 parents a0942af + aa133e2 commit 15ecb98
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 16 deletions.
3 changes: 2 additions & 1 deletion manifests/fragment.pp
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
if $backup {
warning('The $backup parameter to concat::fragment is deprecated and has no effect')
}
$my_backup = concat_getparam(Concat[$target], 'backup')
if $ensure == undef {
$my_ensure = concat_getparam(Concat[$target], 'ensure')
} else {
Expand Down Expand Up @@ -118,7 +119,7 @@
mode => $fragmode,
source => $source,
content => $content,
backup => false,
backup => $my_backup,
replace => true,
alias => "concat_fragment_${name}",
notify => Exec["concat_${target}"]
Expand Down
2 changes: 1 addition & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
}

File {
backup => false,
backup => $backup,
}

# reset poisoned Exec defaults
Expand Down
4 changes: 0 additions & 4 deletions manifests/setup.pp
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@
default => $script_path
}

File {
backup => false,
}

file { $script_path:
ensure => file,
owner => $default_owner,
Expand Down
6 changes: 3 additions & 3 deletions spec/acceptance/nodesets/default.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
HOSTS:
centos-64-x64:
centos-66-x64:
roles:
- master
platform: el-6-x86_64
box : centos-64-x64-vbox4210-nocm
box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
box : puppetlabs/centos-6.6-64-nocm
box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-6.6-64-nocm
hypervisor : vagrant
CONFIG:
type: git
4 changes: 0 additions & 4 deletions spec/unit/classes/concat_setup_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
:owner => 'root',
:group => 0,
:source => 'puppet:///modules/concat/concatfragments.rb',
:backup => false,
})
end

Expand All @@ -32,7 +31,6 @@
:mode => '0755',
:owner => 'root',
:group => 0,
:backup => false,
})
end
end
Expand Down Expand Up @@ -71,7 +69,6 @@
:group => 0,
:mode => '0755',
:source => 'puppet:///modules/concat/concatfragments.rb',
:backup => false,
})
end
end # on osfamily Solaris
Expand All @@ -95,7 +92,6 @@
:group => nil,
:mode => nil,
:source => 'puppet:///modules/concat/concatfragments.rb',
:backup => false,
})
end
end # on osfamily windows
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/defines/concat_fragment_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
:source => p[:source],
:content => p[:content],
:alias => "concat_fragment_#{title}",
:backup => false,
:backup => 'puppet',
})
end
end
Expand Down
3 changes: 1 addition & 2 deletions spec/unit/defines/concat_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
default_warn_message = '# This file is managed by Puppet. DO NOT EDIT.'

file_defaults = {
:backup => false,
:backup => p[:backup],
}

let(:title) { title }
Expand Down Expand Up @@ -138,7 +138,6 @@
it do
should contain_file(file).with(file_defaults.merge({
:ensure => 'absent',
:backup => false,
:force => true,
}))
end
Expand Down

0 comments on commit 15ecb98

Please sign in to comment.