X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Finit.pp;h=5668d110059d0b82afca2b026e700463e4b86c61;hb=e5f2dfe294a563f5ebcec3d31949a81e1815db6e;hp=ceb8d5ce0bffb38a7bf1bf2fc6b74033819ae25f;hpb=7dc60ae5ea1e345719fb5c11397b9ca98b97c5ae;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/init.pp b/manifests/init.pp
index ceb8d5c..5668d11 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -33,60 +33,69 @@ class apt(
   validate_bool($purge_sources_list, $purge_sources_list_d)
 
   $refresh_only_apt_update = $always_apt_update? {
-    true => false,
-    false => true
+    true  => false,
+    false => true,
   }
 
-  package { "python-software-properties": }
+  if ! defined(Package['python-software-properties']) {
+    package { 'python-software-properties': }
+  }
+
+  $sources_list_content = $purge_sources_list ? {
+    false =>  undef,
+    true  => "# Repos managed by puppet.\n",
+  }
 
-  file { "sources.list":
-    path => "${apt::params::root}/sources.list",
-    ensure => present,
-    owner => root,
-    group => root,
-    mode => 644,
-    content => $purge_sources_list ? {
-      false =>  undef,
-      true  => "# Repos managed by puppet.\n",
-    },
+  $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,
   }
 
-  file { "sources.list.d":
-    path => "${apt::params::root}/sources.list.d",
-    ensure => directory,
-    owner => root,
-    group => root,
-    purge => $purge_sources_list_d,
+  file { 'sources.list.d':
+    ensure  => directory,
+    path    => $sources_list_d
+    owner   => root,
+    group   => root,
+    purge   => $purge_sources_list_d,
     recurse => $purge_sources_list_d,
   }
 
-  exec { "apt_update":
-    command => "${apt::params::provider} update",
-    subscribe => [ File["sources.list"], File["sources.list.d"] ],
+  exec { 'apt_update':
+    command     => "${provider} update",
+    subscribe   => [ File['sources.list'], File['sources.list.d'] ],
     refreshonly => $refresh_only_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") }
+    default: { fail('Valid values for disable_keys are true or false') }
   }
 
   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}\";",
     }
   }