X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Finit.pp;h=b41d359fbdeb22652a42db531ea387cf9abf05cb;hb=44fd06c4a47d8e75fa659fdcdabf20e912195496;hp=0f6bcef6218767de8fd62d3e5785779175c8d4ee;hpb=a4af11f7bc37211c690297c7893d99c12f7ef302;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/init.pp b/manifests/init.pp
index 0f6bcef..b41d359 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -3,11 +3,16 @@
 # This module manages the initial configuration of apt.
 #
 # Parameters:
-#   Both of the parameters listed here are not required in general and were
+#   The parameters listed here are not required in general and were
 #     added for use cases related to development environments.
 #   disable_keys - disables the requirement for all packages to be signed
 #   always_apt_update - rather apt should be updated on every run (intended
 #     for development environments where package updates are frequent
+#   purge_sources_list - Accepts true or false. Defaults to false If set to
+#     true, Puppet will purge all unmanaged entries from sources.list"
+#   purge_sources_list_d - Accepts true or false. Defaults to false. If set
+#     to false, Puppet will purge all unmanaged entries from sources.list.d
+#
 # Actions:
 #
 # Requires:
@@ -19,12 +24,13 @@ class apt(
   $disable_keys = undef,
   $proxy_host = false,
   $proxy_port = '8080',
-  $purge = false
+  $purge_sources_list = false,
+  $purge_sources_list_d = false
 ) {
 
   include apt::params
 
-  validate_bool($purge)
+  validate_bool($purge_sources_list, $purge_sources_list_d)
 
   $refresh_only_apt_update = $always_apt_update? {
     true => false,
@@ -41,7 +47,7 @@ class apt(
     owner => root,
     group => root,
     mode => 644,
-    content => $purge ? {
+    content => $purge_sources_list ? {
       false =>  undef,
       true  => "# Repos managed by puppet.\n",
     },
@@ -52,8 +58,8 @@ class apt(
     ensure => directory,
     owner => root,
     group => root,
-    purge => $purge,
-    recurse => $purge,
+    purge => $purge_sources_list_d,
+    recurse => $purge_sources_list_d,
   }
 
   exec { "apt_update":