From 91aaef629192663d98b968979abc1029bbb86f17 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Mon, 10 Feb 2014 09:42:02 +0100
Subject: [PATCH] Bind MongoDB to internal eth

- Bind MongoDB to internal eth
- Readd nojournal
- Readd unit tests

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
---
 manifests/database/nosql.pp               | 21 ++++++++++++++++-----
 spec/classes/cloud_database_nosql_spec.rb |  7 +++++--
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/manifests/database/nosql.pp b/manifests/database/nosql.pp
index 0c73aae5..24195edf 100644
--- a/manifests/database/nosql.pp
+++ b/manifests/database/nosql.pp
@@ -17,11 +17,21 @@
 #
 # Install a nosql server (MongoDB)
 #
+# === Parameters:
+#
+# [*bind_ip*]
+#   (optional) IP address on which mongod instance should listen
+#   Defaults in params
+#
+# [*nojournal*]
+#   (optional) Disable mongodb internal cache. This is not recommended for
+#   production but results in a much faster boot process.
+#   http://docs.mongodb.org/manual/reference/configuration-options/#nojournal
+#   Defaults to false
+#
+
 class cloud::database::nosql(
-  # $bind_ip   = $os_params::api_eth,
-  # disabled for the moment
-  # See: https://github.com/enovance/puppet-cloud/issues/186
-  $bind_ip   = undef,
+  $bind_ip   = $os_params::internal_netif_ip,
   $nojournal = false,
 ) {
 
@@ -33,7 +43,8 @@ class cloud::database::nosql(
     manage_package_repo => true
   }->
   class { 'mongodb':
-    bind_ip => $bind_ip_real,
+    bind_ip   => $bind_ip_real,
+    nojournal => $nojournal
   }
 
 }
diff --git a/spec/classes/cloud_database_nosql_spec.rb b/spec/classes/cloud_database_nosql_spec.rb
index d86e72dc..a02bfe74 100644
--- a/spec/classes/cloud_database_nosql_spec.rb
+++ b/spec/classes/cloud_database_nosql_spec.rb
@@ -23,13 +23,16 @@ describe 'cloud::database::nosql' do
   shared_examples_for 'openstack database nosql' do
 
     let :params do
-      { :bind_ip => '10.0.0.1' }
+      { :bind_ip   => '10.0.0.1',
+        :nojournal => false }
     end
 
     it 'configure mongodb server' do
       should contain_class('mongodb::globals').with( :manage_package_repo => true)
+      should contain_class('mongodb::globals').with_before('Class[Mongodb]')
       should contain_class('mongodb').with(
-        :bind_ip => ['10.0.0.1']
+        :bind_ip   => ['10.0.0.1'],
+        :nojournal => false
       )
     end