X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fsource.pp;h=9f31fe91308bbb911b5013a21227b17e4f0e11db;hb=f3735d2ba228fde8d2e119742e11bece4c2c78ac;hp=e9fa3083039c0aa76c9c4b580a370bc34bc15a63;hpb=f848bac6072f99e1cd60a0cc0b84e5679c598dab;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/source.pp b/manifests/source.pp
index e9fa308..9f31fe9 100644
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -2,49 +2,60 @@
 # add an apt source
 
 define apt::source(
-	$location = '',
-	$release = 'karmic',
-	$repos = 'main',
-	$include_src = true,
-	$required_packages = false,
-	$key = false,
-	$key_server = 'keyserver.ubuntu.com',
-	$pin = false
+  $location = '',
+  $release = 'karmic',
+  $repos = 'main',
+  $include_src = true,
+  $required_packages = false,
+  $key = false,
+  $key_server = 'keyserver.ubuntu.com',
+  $pin = false,
+  $key_content = false
 ) {
 
-	include apt
-
-	file { "${name}.list":
-		name => "${apt::root}/sources.list.d/${name}.list",
-		ensure => file,
-		owner => root,
-		group => root,
-		mode => 644,
-		content => template("apt/source.list.erb"),
-	}
-	
-	if $pin != false {
-		apt::pin { "${release}": priority => "${pin}" }
-	}
-	
-	exec { "${name} apt update":
-		command => "${apt::provider} update",
-		subscribe => File["${name}.list"],
-		refreshonly => true,
-	}
-	
-	if $required_packages != false {
-		exec { "${apt::provider} -y install ${required_packages}":
-			subscribe => File["${name}.list"],
-			refreshonly => true,
-		}
-	}
-	
-	if $key != false {
-		exec { "apt-key adv --keyserver ${key_server} --recv-keys ${key}":
-			unless => "apt-key list | grep ${key}",
-			before => File["${name}.list"],
-		}
-	}
+  include apt::params
 
+  file { "${name}.list":
+    path => "${apt::params::root}/sources.list.d/${name}.list",
+    ensure => file,
+    owner => root,
+    group => root,
+    mode => 644,
+    content => template("apt/source.list.erb"),
+
+  }
+
+  if $pin != false {
+    apt::pin { "${release}": priority => "${pin}" } -> File["${name}.list"]
+  }
+
+  exec { "${name} apt update":
+    command => "${apt::params::provider} update",
+    subscribe => File["${name}.list"],
+    refreshonly => true,
+  }
+
+  if $required_packages != false {
+    exec { "Required packages: '${required_packages}' for ${name}":
+      command     => "${apt::params::provider} -y install ${required_packages}",
+      subscribe   => File["${name}.list"],
+      refreshonly => true,
+    }
+  }
+
+  if $key != false {
+    if $key_content {
+      exec { "Add key: ${key} from content for ${name}":
+        command => "/bin/echo '${key_content}' | /usr/bin/apt-key add -",
+        unless => "/usr/bin/apt-key list | /bin/grep '${key}'",
+        before => File["${name}.list"],
+      }
+    } else {
+      exec { "Add key: ${key} from ${key_server} for ${name}":
+        command => "/usr/bin/apt-key adv --keyserver ${key_server} --recv-keys ${key}",
+        unless => "/usr/bin/apt-key list | /bin/grep ${key}",
+        before => File["${name}.list"],
+      }
+    }
+  }
 }