Fix #46 mysql::queryfile should be execute on remote server only when remote_host is specified

Author: lermit

manifests/grant.pp

@@ -90,6 +90,11 @@
     default  => any2bool($mysql_create_db)
   }
 
+  $manage_remote_host = $remote_host ? {
+    ''      => 'localhost',
+    default => $remote_host,
+  }
+
   if (!defined(File[$mysql_grant_filepath])) {
     file { $mysql_grant_filepath:
       ensure => directory,
@@ -125,7 +130,6 @@
     default => undef,
   }
 
-
   exec { "mysqlgrant-${mysql_user}-${nice_mysql_host}-${dbname}":
     command     => $exec_command,
     require     => $exec_require,
@@ -137,10 +141,10 @@
   if $mysql_db_init_query_file != '' and $mysql_create_db == true {
     mysql::queryfile { "mysql_db_init_query_file-${nice_mysql_host}-${dbname}":
       mysql_file     => $mysql_db_init_query_file,
-      mysql_user     => $mysql_user,
-      mysql_password => $mysql_password,
+      mysql_user     => $remote_user,
+      mysql_password => $remote_password,
       mysql_db       => $mysql_db,
-      mysql_host     => $mysql_host,
+      mysql_host     => $manage_remote_host,
       subscribe      => Exec["mysqlgrant-${mysql_user}-${nice_mysql_host}-${dbname}"],
     }
   }

spec/defines/grant_spec.rb

@@ -127,4 +127,50 @@
     it { should contain_file('mysqlgrant-someuser-10.42.42.0_255.255.255.0-all.sql').with_content(/REVOKE ALL ON \*\.\* FROM 'someuser'@'10.42.42.0\/255.255.255.0';/) }
     it { should contain_file('mysqlgrant-someuser-10.42.42.0_255.255.255.0-all.sql').with_content(/FLUSH PRIVILEGES;/) }
   end
+
+  describe 'Test grant with initial data' do
+    let(:params) { {
+      :name                     => 'sample1',
+      :mysql_db                 => 'example_db',
+      :mysql_user               => 'someuser',
+      :mysql_password           => 'somepassword',
+      :mysql_db_init_query_file => '/example/42.sql',
+    } }
+
+    it { should contain_mysql__queryfile('mysql_db_init_query_file-localhost-example_db').with_mysql_file('/example/42.sql') }
+    it { should contain_mysql__queryfile('mysql_db_init_query_file-localhost-example_db').with_mysql_host('localhost') }
+  end
+
+  describe 'Test grant with initial data' do
+    let(:params) { {
+      :name                     => 'sample1',
+      :mysql_db                 => 'example_db',
+      :mysql_host               => '10.42.42.0/255.255.255.0',
+      :mysql_user               => 'someuser',
+      :mysql_password           => 'somepassword',
+      :mysql_db_init_query_file => '/example/42.sql',
+    } }
+
+    it { should contain_mysql__queryfile('mysql_db_init_query_file-10.42.42.0_255.255.255.0-example_db').with_mysql_file('/example/42.sql') }
+    it { should contain_mysql__queryfile('mysql_db_init_query_file-10.42.42.0_255.255.255.0-example_db').with_mysql_host('localhost') }
+  end
+
+  describe 'Test grant with initial data' do
+    let(:params) { {
+      :name                     => 'sample1',
+      :mysql_db                 => 'example_db',
+      :mysql_host               => '10.42.42.0/255.255.255.0',
+      :mysql_user               => 'someuser',
+      :mysql_password           => 'somepassword',
+      :mysql_db_init_query_file => '/example/42.sql',
+      :remote_host              => '10.42.42.42',
+      :remote_user              => 'user42',
+      :remote_password          => 'pass42',
+    } }
+
+    it { should contain_mysql__queryfile('mysql_db_init_query_file-10.42.42.0_255.255.255.0-example_db').with_mysql_file('/example/42.sql') }
+    it { should contain_mysql__queryfile('mysql_db_init_query_file-10.42.42.0_255.255.255.0-example_db').with_mysql_host('10.42.42.42') }
+    it { should contain_mysql__queryfile('mysql_db_init_query_file-10.42.42.0_255.255.255.0-example_db').with_mysql_user('user42') }
+    it { should contain_mysql__queryfile('mysql_db_init_query_file-10.42.42.0_255.255.255.0-example_db').with_mysql_password('pass42') }
+  end
 end