diff options
| author | Micah Anderson <micah@leap.se> | 2013-08-28 10:07:45 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2013-08-28 10:07:45 -0400 |
| commit | b093daf38d1bf33170382349ae8326e800ed70cd (patch) | |
| tree | 9dbce5e79765f1bac4f26d0015fe4114daff533e /puppet/modules/leap_mx | |
| parent | 6e0c0e5617d2c55457be25fae5ad2e3898936a51 (diff) | |
| parent | 92ad38f756f277866e6a3953dbc3e7f31b99898f (diff) | |
Merge branch 'feature/3579' into develop
Diffstat (limited to 'puppet/modules/leap_mx')
| -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'] } # |