stackforge/puppet-openstack-cloud
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins
2015-03-30 19:04:53 +00:00
committed by Gerrit Code Review
parent 920a9308bb 3f3e2fd90c
commit 5c25c47ca2
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]] 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" : file { "/etc/systemd/system/${mysql_service_name}.service.d" :
ensure => directory, 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 before :each do
facts.merge!( :hostname => 'os-ci-test1', facts.merge!( :hostname => 'os-ci-test1',
:osfamily => 'RedHat', :osfamily => 'RedHat',
:operatingsystemrelease => 7 ) :operatingsystemmajrelease => 7 )
end end
before :each do before :each do
params.merge!(:mysql_systemd_override_settings => { 'LimitNOFILE' => 666 }) params.merge!(:mysql_systemd_override_settings => { 'LimitNOFILE' => 666 })
@@ -113,7 +113,7 @@ describe 'cloud::database::sql::mysql' do
before :each do before :each do
facts.merge!( :hostname => 'os-ci-test1', facts.merge!( :hostname => 'os-ci-test1',
:osfamily => 'RedHat', :osfamily => 'RedHat',
:operatingsystemrelease => 7 ) :operatingsystemmajrelease => 7 )
end end
before :each do before :each do
params.merge!(:open_files_limit => 666) params.merge!(:open_files_limit => 666)
@@ -300,7 +300,7 @@ describe 'cloud::database::sql::mysql' do
context 'on RedHat platforms' do context 'on RedHat platforms' do
let :facts do let :facts do
{ :osfamily => 'RedHat', { :osfamily => 'RedHat',
:operatingsystemrelease => 7 } :operatingsystemmajrelease => 7 }
end end
let :platform_params do let :platform_params do