stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge "Use full path for test in cloud::database::sql::mysql"

Browse Source
This commit is contained in:
Jenkins 2015-03-26 15:29:40 +00:00 committed by Gerrit Code Review
commit ec1e13556f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -358,7 +358,7 @@ class cloud::database::sql::mysql (
# but MariaDB is not packaged for Red Hat / CentOS 7 in MariaDB repository.
exec { 'bootstrap-mysql':
command => '/usr/bin/mysql_install_db --rpm --user=mysql',
unless => 'test -d /var/lib/mysql/mysql',
unless => '/usr/bin/test -d /var/lib/mysql/mysql',
before => Service['mysqld'],
require => [Package[$mysql_server_package_name], File[$mysql_server_config_file]]
}

2
spec/classes/cloud_database_sql_mysql_spec.rb
View File

@ -222,7 +222,7 @@ describe 'cloud::database::sql::mysql' do
it 'configure mysql database' do
is_expected.to contain_exec('bootstrap-mysql').with(
:command => '/usr/bin/mysql_install_db --rpm --user=mysql',
:unless => "test -d /var/lib/mysql/mysql",
:unless => "/usr/bin/test -d /var/lib/mysql/mysql",
:before => 'Service[mysqld]'
)
end