X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Finit.pp;h=e41cd3fdee7514b6373603d917638e3a77dbd28e;hb=0ffe484c7c5d64295f32eb34ce47c60eb823c66c;hp=472ed06d46a44f2e81d2755d2c247bc41da774be;hpb=1160bcd6d1c190e9afc3399b6b4895f9606b213f;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/init.pp b/manifests/init.pp
index 472ed06..e41cd3f 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,69 +24,74 @@ 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
+  include apt::update
 
-  validate_bool($purge)
+  validate_bool($purge_sources_list, $purge_sources_list_d)
 
-  $refresh_only_apt_update = $always_apt_update? {
-    true => false,
-    false => true
+  $sources_list_content = $purge_sources_list ? {
+    false => undef,
+    true  => "# Repos managed by puppet.\n",
   }
 
-  package { "python-software-properties": }
-
-  file { "sources.list":
-    path => "${apt::params::root}/sources.list",
-    ensure => present,
-    owner => root,
-    group => root,
-    mode => 644,
-    content => $purge ? {
-      false =>  undef,
-      true  => "# Repos managed by puppet.\n",
-    },
+  if $always_apt_update == true {
+    Exec <| title=='apt_update' |> {
+      refreshonly => false,
+    }
   }
 
-  file { "sources.list.d":
-    path => "${apt::params::root}/sources.list.d",
-    ensure => directory,
-    owner => root,
-    group => root,
-    purge => $purge,
-    recurse => $purge,
+  $root           = $apt::params::root
+  $apt_conf_d     = $apt::params::apt_conf_d
+  $sources_list_d = $apt::params::sources_list_d
+  $provider       = $apt::params::provider
+
+  file { 'sources.list':
+    ensure  => present,
+    path    => "${root}/sources.list",
+    owner   => root,
+    group   => root,
+    mode    => '0644',
+    content => $sources_list_content,
+    notify  => Exec['apt_update'],
   }
 
-  exec { "apt_update":
-    command => "${apt::params::provider} update",
-    subscribe => [ File["sources.list"], File["sources.list.d"] ],
-    refreshonly => $refresh_only_apt_update,
+  file { 'sources.list.d':
+    ensure  => directory,
+    path    => $sources_list_d,
+    owner   => root,
+    group   => root,
+    purge   => $purge_sources_list_d,
+    recurse => $purge_sources_list_d,
+    notify  => Exec['apt_update'],
   }
 
   case $disable_keys {
     true: {
-      file { "99unauth":
-        content => "APT::Get::AllowUnauthenticated 1;\n",
+      file { '99unauth':
         ensure  => present,
-        path    => "/etc/apt/apt.conf.d/99unauth",
+        content => "APT::Get::AllowUnauthenticated 1;\n",
+        path    => "${apt_conf_d}/99unauth",
       }
     }
     false: {
-      file { "99unauth":
+      file { '99unauth':
         ensure => absent,
-        path   => "/etc/apt/apt.conf.d/99unauth",
+        path   => "${apt_conf_d}/99unauth",
       }
     }
-    undef: { } # do nothing
-    default: { fail("Valid values for disable_keys are true or false") }
+    undef:   { } # do nothing
+    default: { fail('Valid values for disable_keys are true or false') }
   }
 
-  if($proxy_host) {
+  if ($proxy_host) {
     file { 'configure-apt-proxy':
-      path    => '/etc/apt/apt.conf.d/proxy',
+      path    => "${apt_conf_d}/proxy",
       content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";",
+      notify  => Exec['apt_update'],
     }
   }
 }