[puppet] legacy keys should still be installed - make it configurable.

Author: truthbk

manifests/ubuntu.pp

@@ -10,19 +10,31 @@
 #
 # Sample Usage:
 #
+#
+#
+define datadog_agent::ubuntu::install_key() {
+  exec { "key ${name}":
+    command => "/usr/bin/apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys ${name}",
+    unless  => "/usr/bin/apt-key list | grep ${name} | grep expires",
+  }
+}
+
 class datadog_agent::ubuntu(
   $apt_key = '382E94DE',
-  $agent_version = 'latest'
+  $agent_version = 'latest',
+  $other_keys = ['C7A7DA52']
 ) {
 
   ensure_packages(['apt-transport-https'])
+  validate_array($other_keys)
 
   if !$::datadog_agent::skip_apt_key_trusting {
-    exec { 'datadog_key':
-      command => "/usr/bin/apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys ${apt_key}",
-      unless  => "/usr/bin/apt-key list | grep ${apt_key} | grep expires",
+    $mykeys = concat($other_keys, [$apt_key])
+
+    ::datadog_agent::ubuntu::install_key { $mykeys:
       before  => File['/etc/apt/sources.list.d/datadog.list'],
     }
+
   }
 
   file { '/etc/apt/sources.list.d/datadog.list':

spec/classes/datadog_agent_ubuntu_spec.rb

@@ -14,7 +14,8 @@
   end
 
   # it should install the mirror
-  it { should contain_exec('datadog_key') }
+  it { should contain_datadog_agent__ubuntu__install_key('C7A7DA52') }
+  it { should contain_datadog_agent__ubuntu__install_key('382E94DE') }
   it do
     should contain_file('/etc/apt/sources.list.d/datadog.list')\
       .that_notifies('Exec[datadog_apt-get_update]')