diff --git a/manifests/database/sql/mysql.pp b/manifests/database/sql/mysql.pp index de8cd94b..b0140fec 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 72da8569..c5c76a1b 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