Merge pull request #101 from martasd/manage-db-status

Added an option to specify db status.

Author: hunner

.fixtures.yml

@@ -1,3 +1,5 @@
 fixtures:
+  repositories:
+    "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib"
   symlinks:
     "mysql": "#{source_dir}"

Modulefile

@@ -6,3 +6,4 @@ license 'Apache 2.0'
 summary 'Mysql module'
 description 'Mysql module'
 project_page 'http://github.com/puppetlabs/puppetlabs-mysql'
+dependency 'puppetlabs/stdlib', '>= 2.2.1'

manifests/db.pp

@@ -16,6 +16,7 @@
 #   [*grant*]       - array of privileges to grant user.
 #   [*enforce_sql*] - whether to enforce or conditionally run sql on creation.
 #   [*sql*]         - sql statement to run.
+#   [*ensure*]      - specifies if a database is present or absent.
 #
 # Actions:
 #
@@ -39,39 +40,44 @@
   $host        = 'localhost',
   $grant       = 'all',
   $sql         = '',
-  $enforce_sql = false
+  $enforce_sql = false,
+  $ensure      = 'present'
 ) {
 
+  validate_re($ensure, [ '^present$', '^absent$' ],
+  "${ensure} is not supported for ensure. Allowed values are 'present' and 'absent'.")
+
   database { $name:
-    ensure   => present,
+    ensure   => $ensure,
     charset  => $charset,
     provider => 'mysql',
     require  => Class['mysql::server'],
   }
 
   database_user { "${user}@${host}":
-    ensure        => present,
+    ensure        => $ensure,
     password_hash => mysql_password($password),
     provider      => 'mysql',
     require       => Database[$name],
   }
 
-  database_grant { "${user}@${host}/${name}":
-    privileges => $grant,
-    provider   => 'mysql',
-    require    => Database_user["${user}@${host}"],
-  }
+  if $ensure == 'present' {
+    database_grant { "${user}@${host}/${name}":
+      privileges => $grant,
+      provider   => 'mysql',
+      require    => Database_user["${user}@${host}"],
+    }
 
-  $refresh = ! $enforce_sql
+    $refresh = ! $enforce_sql
 
-  if $sql {
-    exec{ "${name}-import":
-      command     => "/usr/bin/mysql ${name} < ${sql}",
-      logoutput   => true,
-      refreshonly => $refresh,
-      require     => Database_grant["${user}@${host}/${name}"],
-      subscribe   => Database[$name],
+    if $sql {
+      exec{ "${name}-import":
+        command     => "/usr/bin/mysql ${name} < ${sql}",
+        logoutput   => true,
+        refreshonly => $refresh,
+        require     => Database_grant["${user}@${host}/${name}"],
+        subscribe   => Database[$name],
+      }
     }
   }
-
 }

spec/defines/mysql_db_spec.rb

@@ -9,6 +9,12 @@
     }
   }
 
+  it 'should report an error when ensure is not present or absent' do
+    params.merge!({'ensure' => 'invalid_val'})
+    expect { subject }.to raise_error(Puppet::Error, 
+      /invalid_val is not supported for ensure\. Allowed values are 'present' and 'absent'\./)
+  end
+
   it 'should not notify the import sql exec if no sql script was provided' do
     should contain_database('test_db').without_notify
   end
@@ -27,4 +33,10 @@
     params.merge!({'sql' => 'test_sql', 'enforce_sql' => true})
     should contain_exec('test_db-import').with_refreshonly(false)
   end
+  
+  it 'should not create database and database user' do
+    params.merge!({'ensure' => 'absent', 'host' => 'localhost'})
+    should contain_database('test_db').with_ensure('absent')
+    should contain_database_user('testuser@localhost').with_ensure('absent')
+  end
 end