diff --git a/Puppetfile b/Puppetfile
index 53b5bab..207d872 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -6,5 +6,6 @@ mod 'alup/rbenv'
 mod 'nginx', git: 'https://github.com/jfryman/puppet-nginx'
 mod 'puppetlabs/postgresql'
 mod 'puppetlabs/mysql'
+mod 'gini/cassandra', git: 'https://github.com/dcosson/puppet-cassandra.git'
 mod 'apache', git: 'https://github.com/puppetlabs/puppetlabs-apache'
 mod 'freighthop', path: 'local_modules/freighthop'
diff --git a/Puppetfile.lock b/Puppetfile.lock
index 646b4f9..9ee941d 100644
--- a/Puppetfile.lock
+++ b/Puppetfile.lock
@@ -17,6 +17,15 @@ FORGE
     puppetlabs/stdlib (4.1.0)
     ripienaar/concat (0.2.0)
 
+GIT
+  remote: https://github.com/dcosson/puppet-cassandra.git
+  ref: master
+  sha: 1f83dbe45d1f715d6edec393a7b08c13ec3c3784
+  specs:
+    gini/cassandra (0.4.0)
+      puppetlabs/apt (~> 1)
+      puppetlabs/stdlib (>= 3.0.0)
+
 GIT
   remote: https://github.com/jfryman/puppet-nginx
   ref: master
@@ -44,6 +53,7 @@ DEPENDENCIES
   alup/rbenv (>= 0)
   apache (>= 0)
   freighthop (>= 0)
+  gini/cassandra (>= 0)
   nginx (>= 0)
   puppetlabs/apt (>= 0)
   puppetlabs/mysql (>= 0)
diff --git a/local_modules/freighthop/manifests/database.pp b/local_modules/freighthop/manifests/database.pp
index 932ee0f..cd4d23d 100644
--- a/local_modules/freighthop/manifests/database.pp
+++ b/local_modules/freighthop/manifests/database.pp
@@ -7,4 +7,7 @@
   if member($servers, 'mysql') {
     class { 'freighthop::database::mysql':}
   }
+  if member($servers, 'cassandra') {
+    class { 'freighthop::database::cassandra':}
+  }
 }
diff --git a/local_modules/freighthop/manifests/database/cassandra.pp b/local_modules/freighthop/manifests/database/cassandra.pp
new file mode 100644
index 0000000..d2ac083
--- /dev/null
+++ b/local_modules/freighthop/manifests/database/cassandra.pp
@@ -0,0 +1,15 @@
+class freighthop::database::cassandra(
+  $cluster_name      = 'freighthop',
+  $seeds             = [ '127.0.0.1', ],
+  $listen_address    = '127.0.0.1',
+  $package_name      = 'dsc20',
+  $thread_stack_size = '256',
+) {
+  class { '::cassandra':
+    package_name        => $package_name,
+    cluster_name        => $cluster_name,
+    seeds               => $seeds,
+    thread_stack_size   => $thread_stack_size,
+    listen_address      => $listen_address
+  }
+}
\ No newline at end of file