summaryrefslogtreecommitdiff
path: root/puppet/modules/leap_mx
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-09-03 23:08:08 +0200
committervarac <varacanero@zeromail.org>2014-09-03 23:08:08 +0200
commit0df84cf7987c3047ecc0353e8d29c2c38437a5a2 (patch)
treec0db8548571cba8ef8bb5c2a258136c97780acf7 /puppet/modules/leap_mx
parenta54b82ff7cdae2e44bc3c159473ca03e283f0746 (diff)
parentb806d84a2fc292e3fb8a3f5fd1fb029c2cdb629e (diff)
Merge branch 'master' into develop
Conflicts: platform.rb puppet/modules/site_config/manifests/hosts.pp
Diffstat (limited to 'puppet/modules/leap_mx')
-rw-r--r--puppet/modules/leap_mx/manifests/init.pp12
1 files changed, 8 insertions, 4 deletions
diff --git a/puppet/modules/leap_mx/manifests/init.pp b/puppet/modules/leap_mx/manifests/init.pp
index b59eac01..c90fc231 100644
--- a/puppet/modules/leap_mx/manifests/init.pp
+++ b/puppet/modules/leap_mx/manifests/init.pp
@@ -40,12 +40,16 @@ class leap_mx {
}
#
- # LEAP-MX CODE
+ # LEAP-MX CODE AND DEPENDENCIES
#
- package { 'leap-mx':
- ensure => installed,
- require => Class['site_apt::preferences::twisted']
+ package {
+ 'leap-mx':
+ ensure => latest,
+ require => Class['site_apt::preferences::twisted'];
+
+ [ 'leap-keymanager' ]:
+ ensure => latest;
}
#