Merge pull request #16 from jlambert121/rem_repo_from_yum

repo parameter for yum wasn't used
sensu · Feb 25, 2013 · 7ab31cc · 7ab31cc
2 parents 36ea816 + 753fb18
commit 7ab31cc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -18,7 +18,7 @@
     }
 
     'Fedora','Rhel','Centos': {
-      class { 'sensu::repo::yum': ensure => $ensure, repo => $repo }
+      class { 'sensu::repo::yum': ensure => $ensure }
     }
 
     default: { alert("${::operatingsystem} not supported yet") }

diff --git a/manifests/repo/yum.pp b/manifests/repo/yum.pp
@@ -6,8 +6,7 @@
 #
 
 class sensu::repo::yum (
-    $ensure = 'present',
-    $repo   = 'main'
+    $ensure = 'present'
   ) {
 
   $enabled = $ensure ? {
@@ -19,7 +18,7 @@
     enabled  => $enabled,
     baseurl  => 'http://repos.sensuapp.org/yum/el/$releasever/$basearch/',
     gpgcheck => 0,
-    name     => "sensu-${repo}",
+    name     => "sensu",
     before   => Package['sensu'],
   }
 

diff --git a/spec/classes/sensu_repo_yum_spec.rb b/spec/classes/sensu_repo_yum_spec.rb
@@ -3,7 +3,7 @@
 describe 'sensu::repo::yum', :type => :class do
 
   context 'ensure: present' do
-    let(:params) { { :ensure => 'present', :repo => 'main' } }
+    let(:params) { { :ensure => 'present' } }
     it { should contain_yumrepo('sensu').with(
       'enabled'   => 1,
       'baseurl'   => 'http://repos.sensuapp.org/yum/el/$releasever/$basearch/',
@@ -13,15 +13,15 @@
   end
 
   context 'ensure: absent' do
-    let(:params) { { :ensure => 'absent', :repo => 'main' } }
+    let(:params) { { :ensure => 'absent' } }
     it { should contain_yumrepo('sensu').with(
       'enabled' => 'absent',
       'before'  => 'Package[sensu]'
     ) }
   end
 
   context 'ensure: foo' do
-    let(:params) { { :ensure => 'foo', :repo => 'main' } }
+    let(:params) { { :ensure => 'foo' } }
     it { should contain_yumrepo('sensu').with(
       'enabled' => 'absent',
       'before'  => 'Package[sensu]'