From 92ad38f756f277866e6a3953dbc3e7f31b99898f Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Tue, 27 Aug 2013 15:07:02 -0400
Subject: now that soledad has been split we can better organize things (#3579)

 . create a soledad::common class
 . leap-mx now only needs to include soledad-common
 . move the site_apt::preferences::twisted to a preferences block inside the soledad server class
 . make sure that the packages are doing 'ensure => latest' instead of installed

Change-Id: Ifa978e831cdc8835666b27322a6e068d67251f5d
---
 puppet/modules/soledad/manifests/common.pp | 10 ++++++++++
 puppet/modules/soledad/manifests/init.pp   |  4 ----
 puppet/modules/soledad/manifests/server.pp |  3 ++-
 3 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 puppet/modules/soledad/manifests/common.pp

(limited to 'puppet/modules/soledad')

diff --git a/puppet/modules/soledad/manifests/common.pp b/puppet/modules/soledad/manifests/common.pp
new file mode 100644
index 00000000..8a1d664a
--- /dev/null
+++ b/puppet/modules/soledad/manifests/common.pp
@@ -0,0 +1,10 @@
+class soledad::common {
+
+  include soledad
+
+  package { 'soledad-common':
+    ensure  => latest,
+    require => User['soledad']
+  }
+
+}
diff --git a/puppet/modules/soledad/manifests/init.pp b/puppet/modules/soledad/manifests/init.pp
index 08ba88a7..7d44c8b4 100644
--- a/puppet/modules/soledad/manifests/init.pp
+++ b/puppet/modules/soledad/manifests/init.pp
@@ -27,8 +27,4 @@ class soledad {
       require => User['soledad'];
   }
 
-  package { 'soledad-common':
-    ensure  => installed,
-    require => User['soledad'];
-  }
 }
diff --git a/puppet/modules/soledad/manifests/server.pp b/puppet/modules/soledad/manifests/server.pp
index 00d87a4d..fcf9d461 100644
--- a/puppet/modules/soledad/manifests/server.pp
+++ b/puppet/modules/soledad/manifests/server.pp
@@ -46,7 +46,8 @@ class soledad::server {
   }
 
   package { 'soledad-server':
-    ensure => installed
+    ensure  => latest,
+    require => Class['site_apt::preferences::twisted']
   }
 
   file { '/etc/default/soledad':
-- 
cgit v1.2.3