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

5 files changed, 17 insertions, 9 deletions

diff --git a/puppet/modules/leap_mx/manifests/init.pp b/puppet/modules/leap_mx/manifests/init.pp
index ffa4519d..25b2758f 100644
--- a/puppet/modules/leap_mx/manifests/init.pp
+++ b/puppet/modules/leap_mx/manifests/init.pp
@@ -6,8 +6,9 @@ class leap_mx {
   $couchdb_user     = $couchdb_admin_user['username']
   $couchdb_password = $couchdb_admin_user['password']
 
+  include soledad::common
   include site_apt::preferences::twisted
-  
+
   #
   # USER AND GROUP
   #
@@ -42,7 +43,8 @@ class leap_mx {
   #
 
   package { 'leap-mx':
-    ensure => installed;
+    ensure  => installed,
+    require => Class['site_apt::preferences::twisted']
   }
 
   #
diff --git a/puppet/modules/site_apt/manifests/preferences/twisted.pp b/puppet/modules/site_apt/manifests/preferences/twisted.pp
index 2ba40e3d..abff6838 100644
--- a/puppet/modules/site_apt/manifests/preferences/twisted.pp
+++ b/puppet/modules/site_apt/manifests/preferences/twisted.pp
@@ -3,8 +3,7 @@ class site_apt::preferences::twisted {
   apt::preferences_snippet { 'python-twisted':
     package  => 'python-twisted*',
     release  => "${::lsbdistcodename}-backports",
-    priority => 999,
-    before   => Package['soledad-server']
+    priority => 999;
   }
 
 }
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':