diff --git a/manifests/database/nosql.pp b/manifests/database/nosql/mongodb.pp
similarity index 90%
rename from manifests/database/nosql.pp
rename to manifests/database/nosql/mongodb.pp
index 7795ab7f..468fd85c 100644
--- a/manifests/database/nosql.pp
+++ b/manifests/database/nosql/mongodb.pp
@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-# == Class: cloud::database::nosql
+# == Class: cloud::database::nosql::mongodb
 #
 # Install a nosql server (MongoDB)
 #
@@ -40,11 +40,16 @@
 #   Should be an hash.
 #   Default to {}
 #
-class cloud::database::nosql(
+# [*mongodb_version*]
+#   (optional) Specify MongoDB version
+#   Default to '2.4.0'
+#
+class cloud::database::nosql::mongodb(
   $bind_ip           = '127.0.0.1',
   $nojournal         = false,
   $replset_members   = $::hostname,
   $firewall_settings = {},
+  $mongodb_version   = '2.4.0',
 ) {
 
   # should be an array
@@ -60,11 +65,11 @@ class cloud::database::nosql(
     $manage_package_repo = true
   }
 
-  class { 'mongodb::globals':
+  class { '::mongodb::globals':
     manage_package_repo => $manage_package_repo,
-    version             => '2.4.0',
+    version             => $mongodb_version,
   }->
-  class { 'mongodb':
+  class { '::mongodb':
     bind_ip   => $array_bind_ip,
     nojournal => $nojournal,
     replset   => 'ceilometer',
diff --git a/spec/classes/cloud_database_nosql_spec.rb b/spec/classes/cloud_database_nosql_mongodb_spec.rb
similarity index 96%
rename from spec/classes/cloud_database_nosql_spec.rb
rename to spec/classes/cloud_database_nosql_mongodb_spec.rb
index 8cec2245..d265d278 100644
--- a/spec/classes/cloud_database_nosql_spec.rb
+++ b/spec/classes/cloud_database_nosql_mongodb_spec.rb
@@ -13,18 +13,19 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-# Unit tests for cloud::database:nosql class
+# Unit tests for cloud::database:nosql::mongodb class
 #
 
 require 'spec_helper'
 
-describe 'cloud::database::nosql' do
+describe 'cloud::database::nosql::mongodb' do
 
   shared_examples_for 'openstack database nosql' do
 
     let :params do
       { :bind_ip         => '10.0.0.1',
         :nojournal       => false,
+        :mongodb_version => '2.4.0',
         :replset_members => ['node1', 'node2', 'node3'] }
     end