[agent6][repo] remove beta if on stable and viceversa

Author: truthbk

manifests/redhat.pp

@@ -42,13 +42,17 @@
         require => Remote_file['DATADOG_RPM_KEY.public'],
     }
 
+    yumrepo {'datadog-beta':
+      ensure => absent
+    }
+
     yumrepo {'datadog':
       enabled  => 1,
       gpgcheck => 1,
       gpgkey   => 'https://yum.datadoghq.com/DATADOG_RPM_KEY.public',
       descr    => 'Datadog, Inc.',
       baseurl  => $baseurl,
-      require  => Exec['install-gpg-key'],
+      require  => [Exec['install-gpg-key'], Yumrepo['datadog-beta']],
     }
 
     Package { require => Yumrepo['datadog']}

manifests/redhat/agent6.pp

@@ -4,7 +4,7 @@
 #
 
 class datadog_agent::redhat::agent6(
-  $baseurl = "https://yum.datad0ghq.com/beta/${::architecture}/",
+  $baseurl = "https://yum.datadoghq.com/beta/${::architecture}/",
   $gpgkey = 'https://yum.datadoghq.com/DATADOG_RPM_KEY_E09422B3.public',
   $manage_repo = true,
   $agent_version = 'latest'
@@ -31,13 +31,17 @@
         require => Remote_file['DATADOG_RPM_KEY.public'],
     }
 
+    yumrepo {'datadog':
+      ensure => absent
+    }
+
     yumrepo {'datadog-beta':
       enabled  => 1,
       gpgcheck => 1,
       gpgkey   => 'https://yum.datadoghq.com/DATADOG_RPM_KEY.public',
       descr    => 'Datadog, Inc.',
       baseurl  => $baseurl,
-      require  => Exec['install-gpg-key'],
+      require  => [Exec['install-gpg-key'], Yumrepo['datadog']],
     }
 
     Package { require => Yumrepo['datadog-beta']}

manifests/ubuntu.pp

@@ -30,7 +30,10 @@
     ::datadog_agent::ubuntu::install_key { $mykeys:
       before  => File['/etc/apt/sources.list.d/datadog.list'],
     }
+  }
 
+  file { '/etc/apt/sources.list.d/datadog-beta.list':
+    ensure => absent,
   }
 
   file { '/etc/apt/sources.list.d/datadog.list':
@@ -46,6 +49,7 @@
     refreshonly => true,
     tries       => 2, # https://bugs.launchpad.net/launchpad/+bug/1430011 won't get fixed until 16.04 xenial
     try_sleep   => 30,
+    require     => File['/etc/apt/sources.list.d/datadog-beta.list'],
   }
 
   package { 'datadog-agent-base':

manifests/ubuntu/agent6.pp

@@ -7,7 +7,7 @@
   $apt_key = 'A2923DFF56EDA6E76E55E492D3A80E30382E94DE',
   $agent_version = 'latest',
   $other_keys = ['935F5A436A5A6E8788F0765B226AE980C7A7DA52'],
-  $location = 'https://apt.datad0g.com',
+  $location = 'https://apt.datadoghq.com',
   $release = 'beta',
   $repos = 'main',
 ) {
@@ -24,6 +24,10 @@
 
   }
 
+  file { '/etc/apt/sources.list.d/datadog.list':
+    ensure => absent,
+  }
+
   file { '/etc/apt/sources.list.d/datadog-beta.list':
     owner   => 'root',
     group   => 'root',
@@ -37,6 +41,7 @@
     refreshonly => true,
     tries       => 2, # https://bugs.launchpad.net/launchpad/+bug/1430011 won't get fixed until 16.04 xenial
     try_sleep   => 30,
+    require     => File['/etc/apt/sources.list.d/datadog.list'],
   }
 
   package { 'datadog-agent-base':