From 74cf78f69b514548aa755298fc9a623ac8c4648e Mon Sep 17 00:00:00 2001
From: Jon Scott <jon@jonscott.co.uk>
Date: Thu, 20 Jun 2013 18:21:46 +0100
Subject: [PATCH 1/3] attempt to add mongodbbase class

---
 manifests/init.pp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index a016426..d94346a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -17,14 +17,11 @@
 #    ulimit_nofile => 20000,
 #  }
 #
-class mongodb(
-  $replSet = $mongodb::params::replSet,
-  $ulimit_nofile = $mongodb::params::ulimit_nofile,
+
+class mongodbbase(
   $repository = $mongodb::params::repository,
-  $package = $mongodb::params::package,
-  $enable = true
+  $package = $mongodb::params::package
 ) inherits mongodb::params {
-
   if !defined(Package["python-software-properties"]) {
     package { "python-software-properties":
       ensure => installed,
@@ -56,7 +53,13 @@
     ensure => installed,
     require => Exec["update-apt"],
   }
+}
 
+class mongodb(
+  $replSet = $mongodb::params::replSet,
+  $ulimit_nofile = $mongodb::params::ulimit_nofile,
+  $enable = true
+) inherits mongodbbase {
   service { "mongodb":
     enable => $enable,
     ensure => "running",
@@ -70,5 +73,4 @@
     notify => Service["mongodb"],
     require => Package[$package],
   }
-
 }

From 38f8c15ae1c68086775a60aa37db553e47fd23c2 Mon Sep 17 00:00:00 2001
From: Jon Scott <jon@jonscott.co.uk>
Date: Fri, 21 Jun 2013 15:02:08 +0100
Subject: [PATCH 2/3] split base into own file

---
 manifests/base.pp | 36 ++++++++++++++++++++++++++++++++++++
 manifests/init.pp | 39 +--------------------------------------
 2 files changed, 37 insertions(+), 38 deletions(-)
 create mode 100644 manifests/base.pp

diff --git a/manifests/base.pp b/manifests/base.pp
new file mode 100644
index 0000000..d165913
--- /dev/null
+++ b/manifests/base.pp
@@ -0,0 +1,36 @@
+class base(
+  $repository = $mongodb::params::repository,
+  $package = $mongodb::params::package
+) inherits mongodb::params {
+  if !defined(Package["python-software-properties"]) {
+    package { "python-software-properties":
+      ensure => installed,
+    }
+  }
+
+  exec { "10gen-apt-repo":
+    path => "/bin:/usr/bin",
+    command => "echo '${repository}' >> /etc/apt/sources.list",
+    unless => "cat /etc/apt/sources.list | grep 10gen",
+    require => Package["python-software-properties"],
+  }
+
+  exec { "10gen-apt-key":
+    path => "/bin:/usr/bin",
+    command => "apt-key adv --keyserver keyserver.ubuntu.com --recv 7F0CEB10",
+    unless => "apt-key list | grep 10gen",
+    require => Exec["10gen-apt-repo"],
+  }
+
+  exec { "update-apt":
+    path => "/bin:/usr/bin",
+    command => "apt-get update",
+    unless => "ls /usr/bin | grep mongo",
+    require => Exec["10gen-apt-key"],
+  }
+
+  package { $package:
+    ensure => installed,
+    require => Exec["update-apt"],
+  }
+}
diff --git a/manifests/init.pp b/manifests/init.pp
index d94346a..4beae87 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -18,48 +18,11 @@
 #  }
 #
 
-class mongodbbase(
-  $repository = $mongodb::params::repository,
-  $package = $mongodb::params::package
-) inherits mongodb::params {
-  if !defined(Package["python-software-properties"]) {
-    package { "python-software-properties":
-      ensure => installed,
-    }
-  }
-
-  exec { "10gen-apt-repo":
-    path => "/bin:/usr/bin",
-    command => "echo '${repository}' >> /etc/apt/sources.list",
-    unless => "cat /etc/apt/sources.list | grep 10gen",
-    require => Package["python-software-properties"],
-  }
-
-  exec { "10gen-apt-key":
-    path => "/bin:/usr/bin",
-    command => "apt-key adv --keyserver keyserver.ubuntu.com --recv 7F0CEB10",
-    unless => "apt-key list | grep 10gen",
-    require => Exec["10gen-apt-repo"],
-  }
-
-  exec { "update-apt":
-    path => "/bin:/usr/bin",
-    command => "apt-get update",
-    unless => "ls /usr/bin | grep mongo",
-    require => Exec["10gen-apt-key"],
-  }
-
-  package { $package:
-    ensure => installed,
-    require => Exec["update-apt"],
-  }
-}
-
 class mongodb(
   $replSet = $mongodb::params::replSet,
   $ulimit_nofile = $mongodb::params::ulimit_nofile,
   $enable = true
-) inherits mongodbbase {
+) inherits mongodb::base {
   service { "mongodb":
     enable => $enable,
     ensure => "running",

From 5614213962be2d2cb8555da314da7148e8d5a858 Mon Sep 17 00:00:00 2001
From: Jon Scott <jon@jonscott.co.uk>
Date: Fri, 21 Jun 2013 15:05:21 +0100
Subject: [PATCH 3/3] use correct syntax for base class

---
 manifests/base.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/base.pp b/manifests/base.pp
index d165913..88df89f 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,4 +1,4 @@
-class base(
+class mongodb::base(
   $repository = $mongodb::params::repository,
   $package = $mongodb::params::package
 ) inherits mongodb::params {