Rework apt to use packagecloud repos as well (#640)

voxpupuli · Sep 26, 2017 · ea5c9da · ea5c9da
1 parent 58d53c3
commit ea5c9da
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/manifests/repo/apt.pp b/manifests/repo/apt.pp
@@ -2,8 +2,7 @@
 #   puppetlabs-apt
 #   puppetlabs-stdlib
 class rabbitmq::repo::apt(
-  $location     = 'http://www.rabbitmq.com/debian/',
-  $release      = 'testing',
+  $location     = 'https://packagecloud.io/rabbitmq/rabbitmq-server',
   $repos        = 'main',
   $include_src  = false,
   $key          = '0A9AF2115F4687BD29803A206B73A36E6026DFCA',
@@ -19,10 +18,10 @@
   -> Class['apt::update']
   -> Package<| title == 'rabbitmq-server' |>
 
+  $osname = downcase($facts['os']['name'])
   apt::source { 'rabbitmq':
     ensure       => present,
-    location     => $location,
-    release      => $release,
+    location     => "${location}/${osname}",
     repos        => $repos,
     include      => { 'src' => $include_src },
     key          => {
@@ -33,12 +32,18 @@
     architecture => $architecture,
   }
 
+  # We also need to ensure the packagecloud GPG key - the package itself is
+  # signed with the RMQ signing key, but we need the repo's key as well.
+  apt::key { 'packagecloud':
+    id     => '418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB',
+  }
+
   if $pin != '' {
     validate_re($pin, '\d{1,4}')
     apt::pin { 'rabbitmq':
       packages => '*',
       priority => $pin,
-      origin   => 'www.rabbitmq.com',
+      origin   => 'packagecloud.io',
     }
   }
 }
diff --git a/spec/classes/rabbitmq_spec.rb b/spec/classes/rabbitmq_spec.rb
@@ -52,10 +52,14 @@
           it 'adds a repo with default values' do
             is_expected.to contain_apt__source('rabbitmq').
               with_ensure('present').
-              with_location('http://www.rabbitmq.com/debian/').
-              with_release('testing').
+              with_location("https://packagecloud.io/rabbitmq/rabbitmq-server/#{facts[:os]['name'].downcase}").
+              with_release(nil).
               with_repos('main')
           end
+          it do
+            is_expected.to contain_apt__key('packagecloud').
+              with_id('418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB')
+          end
         else
           it { is_expected.not_to contain_class('rabbitmq::repo::apt') }
           it { is_expected.not_to contain_apt__souce('rabbitmq') }
@@ -82,8 +86,7 @@
         describe 'it sets up an apt::source' do
           it {
             is_expected.to contain_apt__source('rabbitmq').with(
-              'location'    => 'http://www.rabbitmq.com/debian/',
-              'release'     => 'testing',
+              'location'    => "https://packagecloud.io/rabbitmq/rabbitmq-server/#{facts[:os]['name'].downcase}",
               'repos'       => 'main',
               'key'         => '{"id"=>"0A9AF2115F4687BD29803A206B73A36E6026DFCA", "source"=>"https://www.rabbitmq.com/rabbitmq-release-signing-key.asc", "content"=>:undef}'
             )
@@ -97,8 +100,7 @@
         describe 'it sets up an apt::source and pin' do
           it {
             is_expected.to contain_apt__source('rabbitmq').with(
-              'location'    => 'http://www.rabbitmq.com/debian/',
-              'release'     => 'testing',
+              'location'    => "https://packagecloud.io/rabbitmq/rabbitmq-server/#{facts[:os]['name'].downcase}",
               'repos'       => 'main',
               'key'         => '{"id"=>"0A9AF2115F4687BD29803A206B73A36E6026DFCA", "source"=>"https://www.rabbitmq.com/rabbitmq-release-signing-key.asc", "content"=>:undef}'
             )
@@ -108,7 +110,7 @@
             is_expected.to contain_apt__pin('rabbitmq').with(
               'packages' => '*',
               'priority' => '700',
-              'origin'   => 'www.rabbitmq.com'
+              'origin'   => 'packagecloud.io'
             )
           }
         end