[apt] address beta repo management

Author: truthbk

lib/facter/beta_repo.rb

@@ -3,3 +3,9 @@
     File.exist? '/etc/apt/sources.list.d/datadog-beta.list'
   end
 end
+
+Facter.add('apt_agent6_repo') do
+  setcode do
+    File.exist? '/etc/apt/sources.list.d/datadog6.list'
+  end
+end

manifests/ubuntu/agent5.pp

@@ -39,7 +39,7 @@
   # hit this code path. We can't use 'Package' because we later have
   # to ensure dastadog-agent is present.
 
-  if $facts['apt_agent6_beta_repo'] and $agent_version == 'latest' {
+  if ($facts['apt_agent6_beta_repo'] or $facts['apt_agent6_beta_repo']) and $agent_version == 'latest' {
     exec { 'datadog_apt-get_remove_agent6':
       command     => '/usr/bin/apt-get remove -y -q datadog-agent',
     }
@@ -53,6 +53,11 @@
   }
 
   if $facts['apt_agent6_beta_repo'] {
+    apt::source { 'datadog-beta':
+      ensure => absent,
+    }
+  }
+  if $facts['apt_agent6_repo'] {
     apt::source { 'datadog6':
       ensure => absent,
     }