diff --git a/modules/jenkins_slave/files/my.cnf b/modules/jenkins_slave/files/my.cnf
deleted file mode 100644
index ec88969dca..0000000000
--- a/modules/jenkins_slave/files/my.cnf
+++ /dev/null
@@ -1,133 +0,0 @@
-#
-# The MySQL database server configuration file.
-#
-# You can copy this to one of:
-# - "/etc/mysql/my.cnf" to set global options,
-# - "~/.my.cnf" to set user-specific options.
-#
-# One can use all long options that the program supports.
-# Run program with --help to get a list of available options and with
-# --print-defaults to see which it would actually understand and use.
-#
-# For explanations see
-# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
-
-# This will be passed to all mysql clients
-# It has been reported that passwords should be enclosed with ticks/quotes
-# escpecially if they contain "#" chars...
-# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
-[client]
-port		= 3306
-socket		  = /var/run/mysqld/mysqld.sock
-
-# Here is entries for some specific programs
-# The following values assume you have at least 32M ram
-
-# This was formally known as [safe_mysqld]. Both versions are currently parsed.
-[mysqld_safe]
-socket		= /var/run/mysqld/mysqld.sock
-nice		  = 0
-
-[mysqld]
-#
-# * Basic Settings
-#
-# This is important because Ubuntu 12.04 and beyond default to
-# InnoDB, and we want to test that we force everything to InnoDB
-default-storage-engine=MyISAM
-
-#
-# * IMPORTANT
-#   If you make changes to these settings and your system uses apparmor, you may
-#   also need to also adjust /etc/apparmor.d/usr.sbin.mysqld.
-#
-
-user		= mysql
-socket		  = /var/run/mysqld/mysqld.sock
-port		    = 3306
-basedir		      = /usr
-datadir		      	= /var/lib/mysql
-tmpdir			  = /tmp
-skip-external-locking
-#
-# Instead of skip-networking the default is now to listen only on
-# localhost which is more compatible and is not less secure.
-bind-address	     = 127.0.0.1
-#
-# * Fine Tuning
-#
-key_buffer		= 16M
-max_allowed_packet	= 16M
-thread_stack		  = 192K
-thread_cache_size       = 8
-# This replaces the startup script and checks MyISAM tables if needed
-# the first time they are touched
-myisam-recover         = BACKUP
-#max_connections        = 100
-#table_cache            = 64
-#thread_concurrency     = 10
-#
-# * Query Cache Configuration
-#
-query_cache_limit	= 1M
-query_cache_size        = 16M
-#
-# * Logging and Replication
-#
-# Both location gets rotated by the cronjob.
-# Be aware that this log type is a performance killer.
-# As of 5.1 you can enable the log at runtime!
-#general_log_file        = /var/log/mysql/mysql.log
-#general_log             = 1
-
-log_error                = /var/log/mysql/error.log
-
-# Here you can see queries with especially long duration
-#log_slow_queries  = /var/log/mysql/mysql-slow.log
-#long_query_time = 2
-#log-queries-not-using-indexes
-#
-# The following can be used as easy to replay backup logs or for replication.
-# note: if you are setting up a replication slave, see README.Debian about
-#       other settings you may need to change.
-server-id    	       = 1
-log_bin			= /var/log/mysql/mysql-bin.log
-expire_logs_days		= 10
-max_binlog_size         = 100M
-#binlog_do_db		  = include_database_name
-#binlog_ignore_db	  = include_database_name
-#
-# * InnoDB
-#
-# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
-# Read the manual for more InnoDB related options. There are many!
-#
-# * Security Features
-#
-# Read the manual, too, if you want chroot!
-# chroot = /var/lib/mysql/
-#
-# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
-#
-# ssl-ca=/etc/mysql/cacert.pem
-# ssl-cert=/etc/mysql/server-cert.pem
-# ssl-key=/etc/mysql/server-key.pem
-
-
-
-[mysqldump]
-quick
-quote-names
-max_allowed_packet	= 16M
-
-[mysql]
-#no-auto-rehash	# faster start of mysql but no tab completition
-
-[isamchk]
-key_buffer		= 16M
-
-#
-# * IMPORTANT: Additional settings that can override those from this file!
-#   The files must end with '.cnf', otherwise they'll be ignored.
-#
-!includedir /etc/mysql/conf.d/
diff --git a/modules/jenkins_slave/manifests/init.pp b/modules/jenkins_slave/manifests/init.pp
index 63edc16789..21623fda4c 100644
--- a/modules/jenkins_slave/manifests/init.pp
+++ b/modules/jenkins_slave/manifests/init.pp
@@ -107,37 +107,22 @@ class jenkins_slave($ssh_key, $sudo = false, $bare = false, $user = true) {
 
 
     if ($bare == false) {
-         exec { "jenins-slave-mysql":
-          creates => "/var/lib/mysql/openstack_citest/",
-       	  command => "/usr/bin/mysql --defaults-file=/etc/mysql/debian.cnf -e \"\
-       	    CREATE USER 'openstack_citest'@'localhost' IDENTIFIED BY 'openstack_citest';\
-            CREATE DATABASE openstack_citest;\
-            GRANT ALL ON openstack_citest.* TO 'openstack_citest'@'localhost';\
-            FLUSH PRIVILEGES;\"",
-          require => [
-            File["/etc/mysql/my.cnf"],  # For myisam default tables
-            Package["mysql-server"],
-            Service["mysql"]
-          ]
+
+        class {'mysql::server':
+            config_hash =>  {
+                'root_password' => 'insecure_slave',
+                'default_engine' => 'MyISAM',
+                'bind_address' => '127.0.0.1',
+            }
         }
 
-        file { "/etc/mysql/my.cnf":
-          source => 'puppet:///modules/jenkins_slave/my.cnf',
-          owner => 'root',
-          group => 'root',
-          ensure => 'present',
-          replace => 'true',
-          mode => 444,
-          require => Package["mysql-server"],
+        mysql::db { 'openstack_citest':
+            user     => 'openstack_citest',
+                     password => 'openstack_citest',
+                     host     => 'localhost',
+                     grant    => ['all'],
         }
 
-        service { "mysql":
-          name => "mysql",
-          ensure    => running,
-          enable    => true,
-          subscribe => File["/etc/mysql/my.cnf"],
-          require => [File["/etc/mysql/my.cnf"], Package["mysql-server"]]
-        }
     }
 
     file { '/usr/local/jenkins':