resolve merge conflict

sensu · May 30, 2014 · 15399c1 · 15399c1
2 parents 3982108 + 2b5e3ff
commit 15399c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/manifests/repo/yum.pp b/manifests/repo/yum.pp
@@ -13,8 +13,8 @@
       $url = $sensu::repo_source
     } else {
       $url = $sensu::repo ? {
-        'unstable'  => 'http://repos.sensuapp.org/yum-unstable/el/$releasever/$basearch/',
-        default     => 'http://repos.sensuapp.org/yum/el/$releasever/$basearch/'
+        'unstable'  => "http://repos.sensuapp.org/yum-unstable/el/${::operatingsystemmajrelease}/\$basearch/",
+        default     => "http://repos.sensuapp.org/yum/el/${::operatingsystemmajrelease}/\$basearch/"
       }
     }
 

diff --git a/spec/classes/sensu_package_spec.rb b/spec/classes/sensu_package_spec.rb
@@ -85,20 +85,20 @@
       end
 
       context 'redhat' do
-        let(:facts) { { :osfamily => 'RedHat' } }
+        let(:facts) { { :osfamily => 'RedHat', :operatingsystemmajrelease => '6' } }
 
         context 'default' do
           it { should contain_yumrepo('sensu').with(
             :enabled   => 1,
-            :baseurl   => 'http://repos.sensuapp.org/yum/el/$releasever/$basearch/',
+            :baseurl   => 'http://repos.sensuapp.org/yum/el/6/$basearch/',
             :gpgcheck  => 0,
             :before    => 'Package[sensu]'
           ) }
         end
 
         context 'unstable repo' do
           let(:params) { { :repo => 'unstable' } }
-          it { should contain_yumrepo('sensu').with(:baseurl => 'http://repos.sensuapp.org/yum-unstable/el/$releasever/$basearch/' )}
+          it { should contain_yumrepo('sensu').with(:baseurl => 'http://repos.sensuapp.org/yum-unstable/el/6/$basearch/' )}
         end
 
         context 'override repo url' do