summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2013-08-15 14:48:38 -0400
committerMicah Anderson <micah@leap.se>2013-08-15 14:53:34 -0400
commit2eec8200a35ea71e1ea5a1a56fe3a266603284fc (patch)
tree7f6f5336ea1d5ebf78d6c54702f8ef1c0ffa195b
parentcd3be2c03f27a9ecf0b5f4159ae4d16dbeb1f046 (diff)
Because both soledad and leap-mx do not function with twisted 12, we had to backport twisted 13. In order to install the backported dependencies we need an apt preferences_snippet installed for the backported twisted packages
Change-Id: I886bb735eeb3abe7955c7cf054b749554ab84746
-rw-r--r--puppet/modules/leap_mx/manifests/init.pp2
-rw-r--r--puppet/modules/site_apt/manifests/preferences/twisted.pp10
-rw-r--r--puppet/modules/soledad/manifests/server.pp1
3 files changed, 13 insertions, 0 deletions
diff --git a/puppet/modules/leap_mx/manifests/init.pp b/puppet/modules/leap_mx/manifests/init.pp
index 1e186bbb..ffa4519d 100644
--- a/puppet/modules/leap_mx/manifests/init.pp
+++ b/puppet/modules/leap_mx/manifests/init.pp
@@ -6,6 +6,8 @@ class leap_mx {
$couchdb_user = $couchdb_admin_user['username']
$couchdb_password = $couchdb_admin_user['password']
+ include site_apt::preferences::twisted
+
#
# USER AND GROUP
#
diff --git a/puppet/modules/site_apt/manifests/preferences/twisted.pp b/puppet/modules/site_apt/manifests/preferences/twisted.pp
new file mode 100644
index 00000000..2ba40e3d
--- /dev/null
+++ b/puppet/modules/site_apt/manifests/preferences/twisted.pp
@@ -0,0 +1,10 @@
+class site_apt::preferences::twisted {
+
+ apt::preferences_snippet { 'python-twisted':
+ package => 'python-twisted*',
+ release => "${::lsbdistcodename}-backports",
+ priority => 999,
+ before => Package['soledad-server']
+ }
+
+}
diff --git a/puppet/modules/soledad/manifests/server.pp b/puppet/modules/soledad/manifests/server.pp
index ba482f29..00d87a4d 100644
--- a/puppet/modules/soledad/manifests/server.pp
+++ b/puppet/modules/soledad/manifests/server.pp
@@ -1,6 +1,7 @@
class soledad::server {
tag 'leap_service'
include soledad
+ include site_apt::preferences::twisted
$couchdb = hiera('soledad')
$couchdb_host = 'localhost'