From 3f3e2fd90cefe74fa7f80ec98c578d708d30dfb2 Mon Sep 17 00:00:00 2001
From: Christian Berendt <christian@berendt.io>
Date: Fri, 20 Mar 2015 16:48:08 +0100
Subject: [PATCH] Use operatingsystemmajrelease in cloud::database::sql::mysql

At the moment it is not possible to use cloud::database::sql::mysql
on CentOS 7 because of the following error:

Error: Could not retrieve catalog from remote server: Error 400 on
SERVER: comparison of String with 7 failed at
/etc/puppet/modules/cloud/manifests/database/sql/mysql.pp:366

Replacing operatingsystemrelease with operatingsystemmajrelease in the
file manifests/database/sql/mysql.pp solves this issue.

Change-Id: I941f0a3ebdfa70171a1a7ea6757d78c42d773717
---
 manifests/database/sql/mysql.pp               | 2 +-
 spec/classes/cloud_database_sql_mysql_spec.rb | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/database/sql/mysql.pp b/manifests/database/sql/mysql.pp
index 7978bf77..9e959ec9 100644
--- a/manifests/database/sql/mysql.pp
+++ b/manifests/database/sql/mysql.pp
@@ -363,7 +363,7 @@ class cloud::database::sql::mysql (
         require => [Package[$mysql_server_package_name], File[$mysql_server_config_file]]
       }
 
-      if $::operatingsystemrelease >= 7 {
+      if $::operatingsystemmajrelease >= 7 {
         file { "/etc/systemd/system/${mysql_service_name}.service.d" :
           ensure => directory,
         }
diff --git a/spec/classes/cloud_database_sql_mysql_spec.rb b/spec/classes/cloud_database_sql_mysql_spec.rb
index 09ed68c2..feec90a1 100644
--- a/spec/classes/cloud_database_sql_mysql_spec.rb
+++ b/spec/classes/cloud_database_sql_mysql_spec.rb
@@ -98,7 +98,7 @@ describe 'cloud::database::sql::mysql' do
       before :each do
         facts.merge!( :hostname => 'os-ci-test1',
                       :osfamily => 'RedHat',
-                      :operatingsystemrelease => 7 )
+                      :operatingsystemmajrelease => 7 )
       end
       before :each do
         params.merge!(:mysql_systemd_override_settings => { 'LimitNOFILE' => 666 })
@@ -113,7 +113,7 @@ describe 'cloud::database::sql::mysql' do
       before :each do
         facts.merge!( :hostname => 'os-ci-test1',
                       :osfamily => 'RedHat',
-                      :operatingsystemrelease => 7 )
+                      :operatingsystemmajrelease => 7 )
       end
       before :each do
         params.merge!(:open_files_limit => 666)
@@ -300,7 +300,7 @@ describe 'cloud::database::sql::mysql' do
   context 'on RedHat platforms' do
     let :facts do
       { :osfamily => 'RedHat',
-        :operatingsystemrelease => 7 }
+        :operatingsystemmajrelease => 7 }
     end
 
     let :platform_params do