freighthop 0.3.3 → 0.4.0

data/modules/mysql/manifests/client.pp

@@ -17,11 +17,4 @@ class mysql::client (
     }
   }
 
-
-  # Anchor pattern workaround to avoid resources of mysql::client::install to
-  # "float off" outside mysql::client
-  anchor { 'mysql::client::start': } ->
-    Class['mysql::client::install'] ->
-  anchor { 'mysql::client::end': }
-
 }

data/modules/mysql/manifests/server/root_password.pp

@@ -12,8 +12,6 @@ class mysql::server::root_password {
 
     file { "${::root_home}/.my.cnf":
       content => template('mysql/my.cnf.pass.erb'),
-      owner   => 'root',
-      mode    => '0600',
       require => Mysql_user['root@localhost'],
     }
   }

data/modules/mysql/manifests/server.pp

@@ -15,10 +15,6 @@ class mysql::server (
   $service_manage          = $mysql::params::server_service_manage,
   $service_name            = $mysql::params::server_service_name,
   $service_provider        = $mysql::params::server_service_provider,
-  $users                   = {},
-  $grants                  = {},
-  $databases               = {},
-
   # Deprecated parameters
   $enabled                 = undef,
   $manage_service          = undef
@@ -47,7 +43,6 @@ class mysql::server (
   include '::mysql::server::config'
   include '::mysql::server::service'
   include '::mysql::server::root_password'
-  include '::mysql::server::providers'
 
   if $remove_default_accounts {
     class { '::mysql::server::account_security':
@@ -63,7 +58,6 @@ class mysql::server (
   Class['mysql::server::config'] ->
   Class['mysql::server::service'] ->
   Class['mysql::server::root_password'] ->
-  Class['mysql::server::providers'] ->
   Anchor['mysql::server::end']
 
 }

data/modules/mysql/metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-mysql",
-  "version": "2.1.0",
+  "version": "2.0.1",
   "summary": "Mysql module",
   "author": "Puppet Labs",
   "description": "Mysql module",
@@ -14,28 +14,46 @@
     {
       "properties": [
         {
-          "name": "password_hash",
-          "doc": "The password hash of the user. Use mysql_password() for creating such a hash."
-        },
+          "name": "privileges",
+          "doc": "The privileges the user should have. The possible values are implementation dependent."
+        }
+      ],
+      "parameters": [
         {
-          "name": "max_user_connections",
-          "doc": "Max concurrent connections for the user. 0 means no (or global) limit."
+          "name": "name",
+          "doc": "The primary key: either user@host for global privilges or user@host/database for database specific privileges"
+        }
+      ],
+      "providers": [
+        {
+          "name": "mysql",
+          "doc": "Uses mysql as database."
+        }
+      ],
+      "name": "database_grant",
+      "doc": "Manage a database user\u0027s rights."
+    },
+    {
+      "properties": [
+        {
+          "name": "charset",
+          "doc": "The characterset to use for a database"
         }
       ],
       "parameters": [
         {
           "name": "name",
-          "doc": "The name of the user. This uses the \u0027username@hostname\u0027 or username@hostname."
+          "doc": "The name of the database."
         }
       ],
       "providers": [
         {
           "name": "mysql",
-          "doc": "manage users for a mysql database."
+          "doc": "Manages MySQL database."
         }
       ],
-      "name": "database_user",
-      "doc": "Manage a database user. This includes management of users password as well as privileges"
+      "name": "database",
+      "doc": "Manage databases."
     },
     {
       "properties": [
@@ -72,18 +90,6 @@
         {
           "name": "max_user_connections",
           "doc": "Max concurrent connections for the user. 0 means no (or global) limit."
-        },
-        {
-          "name": "max_connections_per_hour",
-          "doc": "Max connections per hour for the user. 0 means no (or global) limit."
-        },
-        {
-          "name": "max_queries_per_hour",
-          "doc": "Max queries per hour for the user. 0 means no (or global) limit."
-        },
-        {
-          "name": "max_updates_per_hour",
-          "doc": "Max updates per hour for the user. 0 means no (or global) limit."
         }
       ],
       "parameters": [
@@ -98,52 +104,46 @@
           "doc": "manage users for a mysql database."
         }
       ],
-      "name": "mysql_user",
-      "doc": "Manage a MySQL user. This includes management of users password as well as privileges."
+      "name": "database_user",
+      "doc": "Manage a database user. This includes management of users password as well as privileges"
     },
     {
       "properties": [
         {
-          "name": "charset",
-          "doc": "The characterset to use for a database"
-        }
-      ],
-      "parameters": [
+          "name": "password_hash",
+          "doc": "The password hash of the user. Use mysql_password() for creating such a hash."
+        },
         {
-          "name": "name",
-          "doc": "The name of the database."
-        }
-      ],
-      "providers": [
+          "name": "max_user_connections",
+          "doc": "Max concurrent connections for the user. 0 means no (or global) limit."
+        },
         {
-          "name": "mysql",
-          "doc": "Manages MySQL database."
-        }
-      ],
-      "name": "database",
-      "doc": "Manage databases."
-    },
-    {
-      "properties": [
+          "name": "max_connections_per_hour",
+          "doc": "Max connections per hour for the user. 0 means no (or global) limit."
+        },
         {
-          "name": "privileges",
-          "doc": "The privileges the user should have. The possible values are implementation dependent."
+          "name": "max_queries_per_hour",
+          "doc": "Max queries per hour for the user. 0 means no (or global) limit."
+        },
+        {
+          "name": "max_updates_per_hour",
+          "doc": "Max updates per hour for the user. 0 means no (or global) limit."
         }
       ],
       "parameters": [
         {
           "name": "name",
-          "doc": "The primary key: either user@host for global privilges or user@host/database for database specific privileges"
+          "doc": "The name of the user. This uses the \u0027username@hostname\u0027 or username@hostname."
         }
       ],
       "providers": [
         {
           "name": "mysql",
-          "doc": "Uses mysql as database."
+          "doc": "manage users for a mysql database."
         }
       ],
-      "name": "database_grant",
-      "doc": "Manage a database user\u0027s rights."
+      "name": "mysql_user",
+      "doc": "Manage a MySQL user. This includes management of users password as well as privileges."
     },
     {
       "properties": [
@@ -181,7 +181,7 @@
     }
   ],
   "checksums": {
-    ".bundle/config": "7f1c988748783d2a8d455376eed1470c",
+    ".bundle/config": "b898efea5e8783d6593fcdabec67e925",
     ".fixtures.yml": "754de171830d3a00220cdc85bcb794a0",
     ".forge-release/pom.xml": "c650a84961ad88de03192e23b63b3549",
     ".forge-release/publish": "1c1d6dd64ef52246db485eb5459aa941",
@@ -189,30 +189,30 @@
     ".forge-release/validate": "7fffde8112f42a1ec986d49ba80ac219",
     ".nodeset.yml": "f2b857f9fc7a701ff118e28591c12925",
     ".travis.yml": "35fe54be03fbc47ce9b015b22240e683",
-    "CHANGELOG": "0955be7c90f16e48ae9749641170ca69",
-    "Gemfile": "4d0813cea67347e0abb409f53f814155",
-    "Gemfile.lock": "9ee04c7900f8209895e1acee1664ce7d",
+    "CHANGELOG": "0b5a3135e4367f298a3051861332ee98",
+    "Gemfile": "c0932f60de4a156b0c2c8ffcbc2fbbff",
+    "Gemfile.lock": "f2a55b4706fb51e03397df6cefe7c28e",
     "LICENSE": "6089b6bd1f0d807edb8bdfd76da0b038",
-    "Modulefile": "8faf920c294adde182c9087cf1113db3",
-    "README.md": "9afcf56a8845ec7e06739bb74478929e",
+    "Modulefile": "503aa2fc184c841f2f0bf0c6c9f783f2",
+    "README.md": "954cbd75a8c9355210d137494362e4f6",
     "Rakefile": "0428ea3759a4692c91604396c406a9c1",
     "TODO": "88ca4024a37992b46c34cb46e4ac39e6",
-    "files/mysqltuner.pl": "65056d1386e04fdf22a1fee556c1b9fc",
+    "files/mysqltuner.pl": "7e6fcb6d010c85cec68cffa90e6cc5b6",
     "lib/puppet/parser/functions/mysql_deepmerge.rb": "6f20428e15e98f2368ee63a56412a7c3",
     "lib/puppet/parser/functions/mysql_password.rb": "a4c8ec72dede069508dbc266131b06a3",
     "lib/puppet/parser/functions/mysql_strip_hash.rb": "3efe69f1eb189b2913e178b8472aaede",
-    "lib/puppet/provider/database/mysql.rb": "66e7506c4823bb5ea150ca3c1b62bc98",
-    "lib/puppet/provider/database_grant/mysql.rb": "163fd7c65bc3e1371393f3d5c8d6ae10",
-    "lib/puppet/provider/database_user/mysql.rb": "47f13b62d5bb05ae7184e50a6a38a13c",
-    "lib/puppet/provider/mysql.rb": "e8eb4be7cead5b8627ccaea1f435c95a",
-    "lib/puppet/provider/mysql_database/mysql.rb": "466af4dc5e7689b47a9322f4d8a9b3f2",
+    "lib/puppet/provider/database/mysql.rb": "67459a5b7d17b0f37a3638d3cd91db69",
+    "lib/puppet/provider/database_grant/mysql.rb": "45ee6d8ffccef4f53e1f75d24c8acd0f",
+    "lib/puppet/provider/database_user/mysql.rb": "4da5e288bbfd99d4a3e06aa15b105a1a",
+    "lib/puppet/provider/mysql.rb": "5b7aed54664c52d817a8283351bf34bd",
+    "lib/puppet/provider/mysql_database/mysql.rb": "3778dfac523cd12ccfc63b5afe6cbc4f",
     "lib/puppet/provider/mysql_grant/mysql.rb": "f27f8cc23f74ce59a49172d8e6a0d5dc",
-    "lib/puppet/provider/mysql_user/mysql.rb": "87aee13a24a2d01ed34e3b91b9297e40",
+    "lib/puppet/provider/mysql_user/mysql.rb": "c50e589eafb556c0e964e1fca3f29fd6",
     "lib/puppet/type/database.rb": "7b4b49b841d41541ce719d1a051ee94b",
     "lib/puppet/type/database_grant.rb": "66fce5df0f3f4111fe37f094965f6f93",
-    "lib/puppet/type/database_user.rb": "b2a87e3854324fb0ae407a1fbad5802a",
+    "lib/puppet/type/database_user.rb": "f8a151a415fe10da92fb4bd5e473df54",
     "lib/puppet/type/mysql_database.rb": "e21a38611edc6cba5454889170bc0ebc",
-    "lib/puppet/type/mysql_grant.rb": "9e34c78952e5fcc073f089e58ab35cf3",
+    "lib/puppet/type/mysql_grant.rb": "f934aa58da207aa4571a1cca285295c2",
     "lib/puppet/type/mysql_user.rb": "ddb054a5fd03689ae4325fbe003a41d3",
     "manifests/backup.pp": "dfa324a48d47935a8423b102458c6516",
     "manifests/bindings.pp": "5976e9b74a29cc3a102f49867709a08f",
@@ -221,20 +221,19 @@
     "manifests/bindings/php.pp": "09017ca0adefbb8bf894393371cfad94",
     "manifests/bindings/python.pp": "50c22f04074695f17ea383b307d01ea3",
     "manifests/bindings/ruby.pp": "99f7c01e468136c8e699fcbb36d037fa",
-    "manifests/client.pp": "ab5a3ece8f5c4cc2174532472bdc5afe",
+    "manifests/client.pp": "8077f76fb6d0a20e071f683767a80d7d",
     "manifests/client/install.pp": "381f70bfbaac921d631e3b115d8ae264",
     "manifests/db.pp": "0dd59f8d1578c25a2517d4fda862624b",
     "manifests/init.pp": "52ad9ac01674695edaf62cc1c48ef4f8",
     "manifests/params.pp": "033b2e0f88f15b2d8aab3b08ed470abd",
-    "manifests/server.pp": "1bafcd02849a12efaa2271e55380393b",
+    "manifests/server.pp": "e7ddee90013fc90072367c9b95569a4e",
     "manifests/server/account_security.pp": "c793a434142ddaa6a529ed59739368fb",
     "manifests/server/backup.pp": "ff6239ff4e2c46f42ec9b34a805c6718",
     "manifests/server/config.pp": "dcc92deb6e2e100bf150016a8fb2a42d",
     "manifests/server/install.pp": "8666481a3ea12e9f76c47dfa558c09e6",
     "manifests/server/monitor.pp": "a63731018c171de9e441009d453dcac8",
     "manifests/server/mysqltuner.pp": "4b19b075ecb7a7054cac237e5f50ed16",
-    "manifests/server/providers.pp": "87a019dce5bbb6b18c9aa61b5f99134c",
-    "manifests/server/root_password.pp": "73738c1b6ee42b896db5356575c95af6",
+    "manifests/server/root_password.pp": "b9c9f96e24693760ce1238f6f72ab3e7",
     "manifests/server/service.pp": "e79e2206b06d41956fb6d87fc1d20aa0",
     "spec/classes/mysql_bindings_spec.rb": "cfc90d020af62a2315129c84f6acc7d9",
     "spec/classes/mysql_client_spec.rb": "1849bea122f7282153cbc46ca04aa851",
@@ -242,7 +241,7 @@
     "spec/classes/mysql_server_backup_spec.rb": "4c7e64b955bf1df76aead3bf93c2ae1c",
     "spec/classes/mysql_server_monitor_spec.rb": "2bf20049616769424afd4a5137e25511",
     "spec/classes/mysql_server_mysqltuner_spec.rb": "7a098808c21e3f08cd26237a96acc878",
-    "spec/classes/mysql_server_spec.rb": "bc2dccc7ea00340a048ac91d602c1ac0",
+    "spec/classes/mysql_server_spec.rb": "b38faa1a9644e04b1fd72a3517a2b043",
     "spec/defines/mysql_db_spec.rb": "26b348846df5013819c7c9f18090ffc4",
     "spec/spec.opts": "a600ded995d948e393fbe2320ba8e51c",
     "spec/spec_helper.rb": "92fefec2bd21423ec2aece165375678b",
@@ -252,29 +251,28 @@
     "spec/system/mysql_bindings_spec.rb": "1e8cb8b2eb50ee3a7f663d6bc979ae2d",
     "spec/system/mysql_db_spec.rb": "798771e3185a52fdc29513bf4eb33d15",
     "spec/system/mysql_server_monitor_spec.rb": "5f282becde15a434aee3f56c99e61ca2",
-    "spec/system/mysql_server_root_password_spec.rb": "3e8fd20f19e0803dcd20cdac5f0179c8",
-    "spec/system/mysql_server_spec.rb": "f3039e1e7737712ca45d7e14e2cad28f",
-    "spec/system/types/mysql_grant_spec.rb": "7224f1d7d44e63a5d3a44b43cc38be5d",
+    "spec/system/mysql_server_root_password_spec.rb": "74f1f9e52c90e8d36b1cf7b3e17f3e8f",
+    "spec/system/mysql_server_spec.rb": "f12e1a4a3602ce165308c7ef792c3a23",
+    "spec/system/types/mysql_grant_spec.rb": "80f472c0c00bb1a6bf0b20528d07405c",
     "spec/system/types/mysql_user_spec.rb": "63f1d4c5136291b3cfba33a07e8bb37d",
     "spec/unit/mysql_password_spec.rb": "7e1f9c635cb9dd4143054e096515006b",
-    "spec/unit/puppet/functions/mysql_deepmerge_spec.rb": "6b33280aa390e1e7788168df65499fd5",
-    "spec/unit/puppet/provider/database/mysql_spec.rb": "3bb92bdaaddfd54e7700012b2418f1ba",
-    "spec/unit/puppet/provider/database_grant/mysql_spec.rb": "261c22e57374b6651b87fcac86c9b563",
-    "spec/unit/puppet/provider/database_user/mysql_spec.rb": "50709cf2cf3f852a56de1856222b9b1f",
-    "spec/unit/puppet/provider/mysql_database/mysql_spec.rb": "86bfe78acaefd34ed195742e9aff5896",
-    "spec/unit/puppet/provider/mysql_user/mysql_spec.rb": "d59edf286efa51990d0db1c0307e91ea",
+    "spec/unit/puppet/functions/mysql_deepmerge_spec.rb": "5ce61731026b4d5f4947234f7ad88671",
+    "spec/unit/puppet/provider/database/mysql_spec.rb": "ba54011f4c5adac3edd8bc6217771a36",
+    "spec/unit/puppet/provider/database_grant/mysql_spec.rb": "8f41819d0365c88499497da9f2a14445",
+    "spec/unit/puppet/provider/database_user/mysql_spec.rb": "92fd8c9c54348547ea20617fde3c6ce3",
+    "spec/unit/puppet/provider/mysql_database/mysql_spec.rb": "979e9c71e9d8ff6e9419c12c9d10e427",
+    "spec/unit/puppet/provider/mysql_user/mysql_spec.rb": "3ead98da6958cd2fa09fc72579b6aa1f",
     "spec/unit/puppet/type/mysql_database_spec.rb": "0b32abc822e7613bdbb46f0a35c5b999",
     "spec/unit/puppet/type/mysql_user_spec.rb": "1a20ac660f54f9976bb5a0c03c339efc",
-    "templates/my.cnf.erb": "0cb43aad4d2c5903cad87bffa3569348",
+    "templates/my.cnf.erb": "700a3b7133dd48b00d5efb0029d6a36c",
     "templates/my.cnf.pass.erb": "30b24a3f29fcc644bd3a73929305cda0",
     "templates/my.conf.cnf.erb": "5ebda0d5d774b2a51c25c43fbfed544a",
     "templates/mysqlbackup.sh.erb": "b5ca36fac16da99ec88344addd03b997",
     "tests/backup.pp": "caae4da564c1f663341bbe50915a5f7d",
-    "tests/bindings.pp": "dda8795d67098b66aa65e81ccc48ed73",
     "tests/init.pp": "6b34827ac4731829c8a117f0b3fb8167",
     "tests/java.pp": "0ad9de4f9f2c049642bcf08124757085",
     "tests/mysql_database.pp": "2a85cd95a9952e3d93aa05f8f236551e",
-    "tests/mysql_grant.pp": "cd42336a6c7b2d27f5d5d6d0e310ee1a",
+    "tests/mysql_grant.pp": "e7dc9d7820ff4fa48b744749986c0d82",
     "tests/mysql_user.pp": "7aa29740f3b6cd8a7041d59af2d595cc",
     "tests/perl.pp": "6e496f19eaae83c90ce8b93236d44bca",
     "tests/python.pp": "b093828acfed9c14e25ebdd60d90c282",

data/modules/mysql/spec/classes/mysql_server_spec.rb

@@ -7,7 +7,6 @@ describe 'mysql::server' do
     it { should contain_class('mysql::server::config') }
     it { should contain_class('mysql::server::service') }
     it { should contain_class('mysql::server::root_password') }
-    it { should contain_class('mysql::server::providers') }
   end
 
   # make sure that overriding the mysqld settings keeps the defaults for everything else
@@ -86,77 +85,4 @@ describe 'mysql::server' do
 
   end
 
-  context 'mysql::server::providers' do
-    describe 'with users' do
-      let(:params) {{:users => {
-        'foo@localhost' => {
-          'max_connections_per_hour' => '1',
-          'max_queries_per_hour'     => '2',
-          'max_updates_per_hour'     => '3',
-          'max_user_connections'     => '4',
-          'password_hash'            => '*F3A2A51A9B0F2BE2468926B4132313728C250DBF'
-        },
-        'foo2@localhost' => {}
-      }}}
-      it { should contain_mysql_user('foo@localhost').with(
-        :max_connections_per_hour => '1',
-        :max_queries_per_hour     => '2',
-        :max_updates_per_hour     => '3',
-        :max_user_connections     => '4',
-        :password_hash            => '*F3A2A51A9B0F2BE2468926B4132313728C250DBF'
-      )}
-      it { should contain_mysql_user('foo2@localhost').with(
-        :max_connections_per_hour => nil,
-        :max_queries_per_hour     => nil,
-        :max_updates_per_hour     => nil,
-        :max_user_connections     => nil,
-        :password_hash            => ''
-      )}
-    end
-
-    describe 'with grants' do
-      let(:params) {{:grants => {
-        'foo@localhost/somedb.*' => {
-          'user'       => 'foo@localhost',
-          'table'      => 'somedb.*',
-          'privileges' => ["SELECT", "UPDATE"],
-          'options'    => ["GRANT"],
-        },
-        'foo2@localhost/*.*' => {
-          'user'       => 'foo2@localhost',
-          'table'      => '*.*',
-          'privileges' => ["SELECT"],
-        },
-      }}}
-      it { should contain_mysql_grant('foo@localhost/somedb.*').with(
-        :user       => 'foo@localhost',
-        :table      => 'somedb.*',
-        :privileges => ["SELECT", "UPDATE"],
-        :options    => ["GRANT"]
-      )}
-      it { should contain_mysql_grant('foo2@localhost/*.*').with(
-        :user       => 'foo2@localhost',
-        :table      => '*.*',
-        :privileges => ["SELECT"],
-        :options    => nil
-      )}
-    end
-
-    describe 'with databases' do
-      let(:params) {{:databases => {
-        'somedb' => {
-          'charset' => 'latin1',
-          'collate' => 'latin1',
-        },
-        'somedb2' => {}
-      }}}
-      it { should contain_mysql_database('somedb').with(
-        :charset => 'latin1',
-        :collate => 'latin1'
-      )}
-      it { should contain_mysql_database('somedb2')}
-    end
-
-  end
-
 end

data/modules/mysql/spec/system/mysql_server_root_password_spec.rb

@@ -18,13 +18,7 @@ describe 'mysql::server::root_password class' do
     end
 
     it 'deletes all databases' do
-      case node.facts['osfamily']
-      when 'Redhat'
-        shell('rm -rf `grep datadir /etc/my.cnf | cut -d" " -f 3`/*')
-      when 'Debian'
-        shell('rm -rf `grep datadir /etc/mysql/my.cnf | cut -d" " -f 3`/*')
-        shell('mysql_install_db')
-      end
+      shell('rm -rf `grep datadir /etc/my.cnf | cut -d" " -f 3`/*')
     end
 
     it 'starts up mysql' do

data/modules/mysql/spec/system/mysql_server_spec.rb

@@ -5,15 +5,12 @@ describe 'mysql class' do
   when 'RedHat'
     package_name = 'mysql-server'
     service_name = 'mysqld'
-    mycnf        = '/etc/my.cnf'
   when 'Suse'
     package_name = 'mysql-community-server'
     service_name = 'mysql'
-    mycnf        = '/etc/my.cnf'
   when 'Debian'
     package_name = 'mysql-server'
     service_name = 'mysql'
-    mycnf        = '/etc/mysql/my.cnf'
   end
 
   describe 'running puppet code' do
@@ -41,7 +38,7 @@ describe 'mysql class' do
     end
   end
 
-  describe 'mycnf' do
+  describe 'my.cnf' do
     it 'should contain sensible values' do
       pp = <<-EOS
         class { 'mysql::server': }
@@ -51,7 +48,7 @@ describe 'mysql class' do
       end
     end
 
-    describe file(mycnf) do
+    describe file('/etc/my.cnf') do
       it { should contain 'key_buffer = 16M' }
       it { should contain 'max_binlog_size = 100M' }
       it { should contain 'query_cache_size = 16M' }
@@ -75,7 +72,7 @@ describe 'mysql class' do
       end
     end
 
-    describe file(mycnf) do
+    describe file('/etc/my.cnf') do
       it { should contain 'key_buffer = 32M' }
       it { should contain 'max_binlog_size = 200M' }
       it { should contain 'query_cache_size = 32M' }

data/modules/mysql/spec/system/types/mysql_grant_spec.rb

@@ -283,32 +283,5 @@ describe 'mysql_grant' do
     end
   end
 
-  describe 'lower case privileges' do
-    it 'create ALL privs' do
-      pp = <<-EOS
-      mysql_grant { 'lowercase@localhost/*.*':
-          user       => 'lowercase@localhost',
-          privileges => 'ALL',
-          table      => '*.*',
-      }
-      EOS
-
-      puppet_apply(pp)
-    end
-
-    it 'create lowercase all privs' do
-      pp = <<-EOS
-      mysql_grant { 'lowercase@localhost/*.*':
-          user       => 'lowercase@localhost',
-          privileges => 'all',
-          table      => '*.*',
-      }
-      EOS
-
-      puppet_apply(pp) do |r|
-        r.exit_code.should be_zero
-      end
-    end
-  end
 
 end

data/modules/mysql/spec/unit/puppet/functions/mysql_deepmerge_spec.rb

@@ -30,7 +30,7 @@ describe Puppet::Parser::Functions.function(:mysql_deepmerge) do
     end
 
     it 'should accept empty strings as puppet undef' do
-      expect { new_hash = scope.function_mysql_deepmerge([{}, ''])}.not_to raise_error
+      expect { new_hash = scope.function_mysql_deepmerge([{}, ''])}.not_to raise_error(Puppet::ParseError, /unexpected argument type String/)
     end
 
     it 'should be able to mysql_deepmerge two hashes' do

data/modules/mysql/spec/unit/puppet/provider/database/mysql_spec.rb

@@ -6,7 +6,7 @@ describe provider_class do
   subject { provider_class }
 
   let(:root_home) { '/root' }
-  let(:defaults_file) { '--defaults-extra-file=/root/.my.cnf' }
+  let(:defaults_file) { '--defaults-file=/root/.my.cnf' }
 
   let(:raw_databases) do
     <<-SQL_OUTPUT
@@ -28,7 +28,7 @@ test
     Facter.stubs(:value).with(:root_home).returns(root_home)
     Puppet::Util.stubs(:which).with('mysql').returns('/usr/bin/mysql')
     subject.stubs(:which).with('mysql').returns('/usr/bin/mysql')
-    subject.stubs(:defaults_file).returns('--defaults-extra-file=/root/.my.cnf')
+    subject.stubs(:defaults_file).returns('--defaults-file=/root/.my.cnf')
   end
 
   describe 'self.instances' do
@@ -77,9 +77,9 @@ test
   end
 
   describe 'self.defaults_file' do
-    it 'sets --defaults-extra-file' do
+    it 'sets --defaults-file' do
       File.stubs(:file?).with('#{root_home}/.my.cnf').returns(true)
-      @provider.defaults_file.should == '--defaults-extra-file=/root/.my.cnf'
+      @provider.defaults_file.should == '--defaults-file=/root/.my.cnf'
     end
   end
 

data/modules/mysql/spec/unit/puppet/provider/database_grant/mysql_spec.rb

@@ -18,7 +18,7 @@ describe provider_class do
   end
 
   it 'should query privileges from the database' do
-    provider_class.expects(:mysql) .with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-Be', 'describe user']).returns <<-EOT
+    provider_class.expects(:mysql) .with(["--defaults-file=#{root_home}/.my.cnf", 'mysql', '-Be', 'describe user']).returns <<-EOT
 Field	Type	Null	Key	Default	Extra
 Host	char(60)	NO	PRI		
 User	char(16)	NO	PRI		
@@ -27,7 +27,7 @@ Select_priv	enum('N','Y')	NO		N
 Insert_priv	enum('N','Y')	NO		N	
 Update_priv	enum('N','Y')	NO		N
 EOT
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-Be', 'describe db']).returns <<-EOT
+    provider_class.expects(:mysql).with(["--defaults-file=#{root_home}/.my.cnf", 'mysql', '-Be', 'describe db']).returns <<-EOT
 Field	Type	Null	Key	Default	Extra
 Host	char(60)	NO	PRI		
 Db	char(64)	NO	PRI		
@@ -41,7 +41,7 @@ EOT
   end
 
   it 'should query set privileges' do
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-Be', "select * from mysql.user where user='user' and host='host'"]).returns <<-EOT
+    provider_class.expects(:mysql).with(["--defaults-file=#{root_home}/.my.cnf", 'mysql', '-Be', "select * from mysql.user where user='user' and host='host'"]).returns <<-EOT
 Host	User	Password	Select_priv	Insert_priv	Update_priv
 host	user		Y	N	Y
 EOT
@@ -49,7 +49,7 @@ EOT
   end
 
   it 'should recognize when all privileges are set' do
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-Be', "select * from mysql.user where user='user' and host='host'"]).returns <<-EOT
+    provider_class.expects(:mysql).with(["--defaults-file=#{root_home}/.my.cnf", 'mysql', '-Be', "select * from mysql.user where user='user' and host='host'"]).returns <<-EOT
 Host	User	Password	Select_priv	Insert_priv	Update_priv
 host	user		Y	Y	Y
 EOT
@@ -57,7 +57,7 @@ EOT
   end
 
   it 'should recognize when all privileges are not set' do
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-Be', "select * from mysql.user where user='user' and host='host'"]).returns <<-EOT
+    provider_class.expects(:mysql).with(["--defaults-file=#{root_home}/.my.cnf", 'mysql', '-Be', "select * from mysql.user where user='user' and host='host'"]).returns <<-EOT
 Host	User	Password	Select_priv	Insert_priv	Update_priv
 host	user		Y	N	Y
 EOT
@@ -65,27 +65,27 @@ EOT
   end
 
   it 'should be able to set all privileges' do
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-NBe', "SELECT '1' FROM user WHERE user='user' AND host='host'"]).returns "1\n"
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-Be', "update user set Select_priv = 'Y', Insert_priv = 'Y', Update_priv = 'Y' where user='user' and host='host'"])
-    provider_class.expects(:mysqladmin).with(%W(--defaults-extra-file=#{root_home}/.my.cnf flush-privileges))
+    provider_class.expects(:mysql).with(["--defaults-file=#{root_home}/.my.cnf", 'mysql', '-NBe', "SELECT '1' FROM user WHERE user='user' AND host='host'"]).returns "1\n"
+    provider_class.expects(:mysql).with(["--defaults-file=#{root_home}/.my.cnf", 'mysql', '-Be', "update user set Select_priv = 'Y', Insert_priv = 'Y', Update_priv = 'Y' where user='user' and host='host'"])
+    provider_class.expects(:mysqladmin).with(%W(--defaults-file=#{root_home}/.my.cnf flush-privileges))
     @provider.privileges=(%w(all))
   end
 
   it 'should be able to set partial privileges' do
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-NBe', "SELECT '1' FROM user WHERE user='user' AND host='host'"]).returns "1\n"
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-Be', "update user set Select_priv = 'Y', Insert_priv = 'N', Update_priv = 'Y' where user='user' and host='host'"])
-    provider_class.expects(:mysqladmin).with(%W(--defaults-extra-file=#{root_home}/.my.cnf flush-privileges))
+    provider_class.expects(:mysql).with(["--defaults-file=#{root_home}/.my.cnf", 'mysql', '-NBe', "SELECT '1' FROM user WHERE user='user' AND host='host'"]).returns "1\n"
+    provider_class.expects(:mysql).with(["--defaults-file=#{root_home}/.my.cnf", 'mysql', '-Be', "update user set Select_priv = 'Y', Insert_priv = 'N', Update_priv = 'Y' where user='user' and host='host'"])
+    provider_class.expects(:mysqladmin).with(%W(--defaults-file=#{root_home}/.my.cnf flush-privileges))
     @provider.privileges=(%w(Select_priv Update_priv))
   end
 
   it 'should be case insensitive' do
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-NBe', "SELECT '1' FROM user WHERE user='user' AND host='host'"]).returns "1\n"
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-Be', "update user set Select_priv = 'Y', Insert_priv = 'Y', Update_priv = 'Y' where user='user' and host='host'"])
-    provider_class.expects(:mysqladmin).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'flush-privileges'])
+    provider_class.expects(:mysql).with(["--defaults-file=#{root_home}/.my.cnf", 'mysql', '-NBe', "SELECT '1' FROM user WHERE user='user' AND host='host'"]).returns "1\n"
+    provider_class.expects(:mysql).with(["--defaults-file=#{root_home}/.my.cnf", 'mysql', '-Be', "update user set Select_priv = 'Y', Insert_priv = 'Y', Update_priv = 'Y' where user='user' and host='host'"])
+    provider_class.expects(:mysqladmin).with(["--defaults-file=#{root_home}/.my.cnf", 'flush-privileges'])
     @provider.privileges=(%w(SELECT_PRIV insert_priv UpDaTe_pRiV))
   end
 
-  it 'should not pass --defaults-extra-file if $root_home/.my.cnf is absent' do
+  it 'should not pass --defaults-file if $root_home/.my.cnf is absent' do
     File.stubs(:file?).with("#{root_home}/.my.cnf").returns(false)
     provider_class.expects(:mysql).with(['mysql', '-NBe', "SELECT '1' FROM user WHERE user='user' AND host='host'"]).returns "1\n"
     provider_class.expects(:mysql).with(['mysql', '-Be', "update user set Select_priv = 'Y', Insert_priv = 'N', Update_priv = 'Y' where user='user' and host='host'"])