summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2013-08-28 10:07:45 -0400
committerMicah Anderson <micah@leap.se>2013-08-28 10:07:45 -0400
commitb093daf38d1bf33170382349ae8326e800ed70cd (patch)
tree9dbce5e79765f1bac4f26d0015fe4114daff533e /puppet
parent6e0c0e5617d2c55457be25fae5ad2e3898936a51 (diff)
parent92ad38f756f277866e6a3953dbc3e7f31b99898f (diff)
Merge branch 'feature/3579' into develop
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/leap_mx/manifests/init.pp6
-rw-r--r--puppet/modules/site_apt/manifests/preferences/twisted.pp3
-rw-r--r--puppet/modules/soledad/manifests/common.pp10
-rw-r--r--puppet/modules/soledad/manifests/init.pp4
-rw-r--r--puppet/modules/soledad/manifests/server.pp3
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':