From 8f9d4130bc1ca13f51e95d3e04e3993231dcfbb4 Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Fri, 20 Mar 2015 16:42:24 +0100 Subject: [PATCH] Use full path for test 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 when trying to call the binary 'test' in 'bootstrap-mysql'. 'test -d /var/lib/mysql/mysql' is not qualified and no path was specified. Please qualify the command or specify a path. Change-Id: I937ee32400da3f9c6154bc75ae8897e5c44dfab2 --- manifests/database/sql/mysql.pp | 2 +- spec/classes/cloud_database_sql_mysql_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/database/sql/mysql.pp b/manifests/database/sql/mysql.pp index 7978bf77..9dde713c 100644 --- a/manifests/database/sql/mysql.pp +++ b/manifests/database/sql/mysql.pp @@ -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]] } diff --git a/spec/classes/cloud_database_sql_mysql_spec.rb b/spec/classes/cloud_database_sql_mysql_spec.rb index 09ed68c2..3b89d7c3 100644 --- a/spec/classes/cloud_database_sql_mysql_spec.rb +++ b/spec/classes/cloud_database_sql_mysql_spec.rb @@ -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