Merge pull request #55 from yinym/redhat-repository

Mapping platform 'redhat' to 'rhel' for redhat platform
sous-chefs · Feb 22, 2015 · 3eb5f88 · 3eb5f88
2 parents 1a93b6c + 4240467
commit 3eb5f88
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/recipes/_redhat_galera.rb b/recipes/_redhat_galera.rb
@@ -17,12 +17,11 @@
 # limitations under the License.
 #
 
-#To force removing of mariadb-libs on CentOS >= 7
+# To force removing of mariadb-libs on CentOS >= 7
 package 'MariaDB-shared' do
-  action:install
+  action :install
 end
 
-
 package 'MariaDB-Galera-server' do
   action :install
   notifies :create, 'directory[/var/log/mysql]', :immediately

diff --git a/recipes/_redhat_server.rb b/recipes/_redhat_server.rb
@@ -17,9 +17,9 @@
 # limitations under the License.
 #
 
-#To force removing of mariadb-libs on CentOS >= 7
+# To force removing of mariadb-libs on CentOS >= 7
 package 'MariaDB-shared' do
-  action:install
+  action :install
 end
 
 package 'MariaDB-server' do

diff --git a/recipes/repository.rb b/recipes/repository.rb
@@ -21,10 +21,15 @@
   when 'yum'
     include_recipe 'yum::default'
 
+    if node['platform'] == 'redhat'
+      target_platform = "rhel#{node['platform_version'].to_i}"
+    else
+      target_platform = "#{node['platform']}#{node['platform_version'].to_i}"
+    end
     yum_repository "mariadb-#{node['mariadb']['install']['version']}" do
       description 'MariaDB Official Repository'
       baseurl 'http://yum.mariadb.org/' + \
-        node['mariadb']['install']['version'] + "/#{node['platform']}#{node['platform_version'].to_i}-amd64"
+        node['mariadb']['install']['version'] + "/#{target_platform}-amd64"
       gpgkey 'https://yum.mariadb.org/RPM-GPG-KEY-MariaDB'
       action :create
     end