Merge pull request redhat-openstack#288 from woneill/ticket/MODULES-1…

…700-backup_files_for_static_compiler

(MODULES-1700) Change the filebucketing behavior so static_compiler can ...

manifests/fragment.pp

@@ -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 {
@@ -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}"]

manifests/init.pp

@@ -141,7 +141,7 @@
   }
 
   File {
-    backup  => false,
+    backup  => $backup,
   }
 
   # reset poisoned Exec defaults

manifests/setup.pp

@@ -47,10 +47,6 @@
     default   => $script_path
   }
 
-  File {
-    backup => false,
-  }
-
   file { $script_path:
     ensure => file,
     owner  => $default_owner,

spec/acceptance/nodesets/default.yml

@@ -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

spec/unit/classes/concat_setup_spec.rb

@@ -21,7 +21,6 @@
         :owner  => 'root',
         :group  => 0,
         :source => 'puppet:///modules/concat/concatfragments.rb',
-        :backup => false,
       })
     end
 
@@ -32,7 +31,6 @@
           :mode   => '0755',
           :owner  => 'root',
           :group  => 0,
-          :backup => false,
         })
       end
     end
@@ -71,7 +69,6 @@
         :group  => 0,
         :mode   => '0755',
         :source => 'puppet:///modules/concat/concatfragments.rb',
-        :backup => false,
       })
     end
   end # on osfamily Solaris
@@ -95,7 +92,6 @@
         :group  => nil,
         :mode   => nil,
         :source => 'puppet:///modules/concat/concatfragments.rb',
-        :backup => false,
       })
     end
   end # on osfamily windows

spec/unit/defines/concat_fragment_spec.rb

@@ -51,7 +51,7 @@
         :source  => p[:source],
         :content => p[:content],
         :alias   => "concat_fragment_#{title}",
-        :backup  => false,
+        :backup  => 'puppet',
       })
     end
   end

spec/unit/defines/concat_spec.rb

@@ -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 }
@@ -138,7 +138,6 @@
         it do
           should contain_file(file).with(file_defaults.merge({
             :ensure => 'absent',
-            :backup => false,
             :force  => true,
           }))
         end