Merge pull request #165 from notanisp/no_package_repos

Machines which don't have internet access can't pull the repo key
sensu · May 29, 2014 · 7b33ef1 · 7b33ef1
2 parents 9cbd52b + b566b13
commit 7b33ef1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/manifests/repo/apt.pp b/manifests/repo/apt.pp
@@ -22,7 +22,12 @@
     } else {
       $url = 'http://repos.sensuapp.org/apt'
     }
-
+    if $ensure == 'present' {
+      apt::key { 'sensu':
+        key         => '7580C77F',
+        key_source  => 'http://repos.sensuapp.org/apt/pubkey.gpg',
+      }
+    }
     apt::source { 'sensu':
       ensure      => $ensure,
       location    => $url,
@@ -32,11 +37,6 @@
       before      => Package['sensu'],
     }
 
-    apt::key { 'sensu':
-      key         => '7580C77F',
-      key_source  => "${url}/pubkey.gpg",
-    }
-
   } else {
     fail('This class requires puppet-apt module')
   }

diff --git a/spec/classes/sensu_package_spec.rb b/spec/classes/sensu_package_spec.rb
@@ -62,7 +62,7 @@
             let(:params) { { :repo_source => 'http://repo.mydomain.com/apt' } }
             it { should contain_apt__source('sensu').with( :location => 'http://repo.mydomain.com/apt') }
 
-            it { should contain_apt__key('sensu').with(
+            it { should_not contain_apt__key('sensu').with(
               :key         => '7580C77F',
               :key_source  => 'http://repo.mydomain.com/apt/pubkey.gpg'
             ) }
@@ -72,7 +72,7 @@
             let(:params) { { :install_repo => false, :repo => 'main' } }
             it { should contain_apt__source('sensu').with_ensure('absent') }
 
-            it { should contain_apt__key('sensu').with(
+            it { should_not contain_apt__key('sensu').with(
               :key         => '7580C77F',
               :key_source  => 'http://repos.sensuapp.org/apt/pubkey.gpg'
             ) }