[agent6][yum] no ensure on yumrepo -> use datadog repo definition for both beta and stable.

Author: truthbk

manifests/redhat.pp

@@ -42,17 +42,13 @@
         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'], Yumrepo['datadog-beta']],
+      require  => Exec['install-gpg-key'],
     }
 
     Package { require => Yumrepo['datadog']}

manifests/redhat/agent6.pp

@@ -32,19 +32,15 @@
     }
 
     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'], Yumrepo['datadog']],
+      require  => Exec['install-gpg-key'],
     }
 
-    Package { require => Yumrepo['datadog-beta']}
+    Package { require => Yumrepo['datadog']}
   }
 
   package { 'datadog-agent-base':

spec/classes/datadog_agent_redhat_spec.rb

@@ -13,8 +13,6 @@
   context 'with manage_repo => true' do
     let(:params){ {:manage_repo => true} }
     it do
-      should contain_yumrepo('datadog-beta')
-        .with_ensure('absent')
       should contain_yumrepo('datadog')
         .with_enabled(1)\
         .with_gpgcheck(1)\
@@ -62,8 +60,6 @@
     let(:params){ {:manage_repo => true} }
     it do
       should contain_yumrepo('datadog')
-        .with_ensure('absent')
-      should contain_yumrepo('datadog-beta')
         .with_enabled(1)\
         .with_gpgcheck(1)\
           .with_gpgkey('https://yum.datadoghq.com/DATADOG_RPM_KEY.public')\
@@ -73,8 +69,7 @@
   context 'with manage_repo => false' do
     let(:params){ {:manage_repo => false} }
     it do
-      should_not contain_yumrepo('datadog-beta')
-      should_not contain_yumrepo('datadog-beta')
+      should_not contain_yumrepo('datadog')
     end
   end