diff options
| author | Micah Anderson <micah@leap.se> | 2013-08-27 15:07:02 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2013-08-27 17:49:20 -0400 |
| commit | 92ad38f756f277866e6a3953dbc3e7f31b99898f (patch) | |
| tree | 7805e82999f034fd23e0038a6ff47da26bbb68bb /puppet/modules/leap_mx/manifests | |
| parent | 14cee35e55c999663dbd8ac34197b6ce7382e35d (diff) | |
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
Diffstat (limited to 'puppet/modules/leap_mx/manifests')
| -rw-r--r-- | puppet/modules/leap_mx/manifests/init.pp | 6 |
1 files changed, 4 insertions, 2 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'] } # |