diff --git a/packstack/puppet/modules/mongodb b/packstack/puppet/modules/mongodb
index 3a0574a4a..3f3929257 160000
--- a/packstack/puppet/modules/mongodb
+++ b/packstack/puppet/modules/mongodb
@@ -1 +1 @@
-Subproject commit 3a0574a4a664cfcff197829eb70976c4862db57a
+Subproject commit 3f392925710f1758a95f1775d700b5fb787a003d
diff --git a/packstack/puppet/templates/ceilometer.pp b/packstack/puppet/templates/ceilometer.pp
index dd5c51613..c0cb8985c 100644
--- a/packstack/puppet/templates/ceilometer.pp
+++ b/packstack/puppet/templates/ceilometer.pp
@@ -1,6 +1,6 @@
-class { 'mongodb':
-    enable_10gen => false,
+class { 'mongodb::server':
     port         => '27017',
+    smallfiles   => true,
     before       => Class['ceilometer::db'],
     require      => Firewall['001 mongodb incoming localhost'],
 }
@@ -28,11 +28,11 @@ class { 'ceilometer':
 
 class { 'ceilometer::db':
     database_connection => 'mongodb://localhost:27017/ceilometer',
-    require             => Class['mongodb'],
+    require             => Class['mongodb::server'],
 }
 
 class { 'ceilometer::collector':
-    require => Class['mongodb'],
+    require => Class['mongodb::server'],
 }
 
 class { 'ceilometer::agent::auth':
@@ -52,5 +52,5 @@ class { 'ceilometer::alarm::evaluator':
 class { 'ceilometer::api':
     keystone_host     => '%(CONFIG_KEYSTONE_HOST)s',
     keystone_password => '%(CONFIG_CEILOMETER_KS_PW)s',
-    require           => Class['mongodb'],
+    require           => Class['mongodb::server'],
 }