stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Use operatingsystemmajrelease in cloud::database::sql::mysql

Browse Source 
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
This commit is contained in:
Christian Berendt
2015-03-20 16:48:08 +01:00
parent c83392984b
commit 3f3e2fd90c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/database/sql/mysql.pp
View File

@@ -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,
}

6
spec/classes/cloud_database_sql_mysql_spec.rb
View File

@@ -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