Merge remote-tracking branch 'shared/master' into leap_master

1 files changed, 8 insertions, 20 deletions

diff --git a/manifests/preseeded_package.pp b/manifests/preseeded_package.pp
index 162ade7..e6fcab1 100644
--- a/manifests/preseeded_package.pp
+++ b/manifests/preseeded_package.pp
@@ -1,24 +1,12 @@
-# Install a package with a preseed file to automatically answer some questions.
+# This is a wrapper that will be removed after a while
 define apt::preseeded_package (
-  $ensure = 'installed',
-  $content = ''
+  $ensure  = 'present',
+  $content = '',
 ) {
-  $seedfile = "/var/cache/local/preseeding/${name}.seeds"
-  $real_content = $content ? {
-    ''      => template ( "site_apt/${::debian_codename}/${name}.seeds" ),
-    default => $content
-  }
-
-  file { $seedfile:
-    content => $real_content,
-    mode    => '0600',
-    owner   => 'root',
-    group   => 0,
-  }
-
-  package { $name:
-    ensure       => $ensure,
-    responsefile => $seedfile,
-    require      => File[$seedfile],
+  warning('apt::preseeded_package is deprecated! you should now use apt::package with parameter use_seed set to true instead.')
+  apt::package { $name:
+    ensure           => $ensure,
+    use_seed         => true,
+    seedfile_content => $content,
   }
 }