summaryrefslogtreecommitdiff
path: root/puppet/modules/site_apt/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-06-14 21:23:15 +0200
committervarac <varacanero@zeromail.org>2013-06-14 21:23:15 +0200
commit85e8d0851e0f53c742c9e26133c250864ad71e8e (patch)
tree60eb55997d3ea01183140859634853bb3b6078d3 /puppet/modules/site_apt/manifests
parent8ee0d3af919b169e1cb096a777beff68dbeb61d3 (diff)
parentbb4b3845130cabffe2e23c7b9112389179a56523 (diff)
Merge branch 'develop' of ssh://code.leap.se/leap_platform into develop
Diffstat (limited to 'puppet/modules/site_apt/manifests')
-rw-r--r--puppet/modules/site_apt/manifests/leap_repo.pp7
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/modules/site_apt/manifests/leap_repo.pp b/puppet/modules/site_apt/manifests/leap_repo.pp
index 9d967841..6b3d9919 100644
--- a/puppet/modules/site_apt/manifests/leap_repo.pp
+++ b/puppet/modules/site_apt/manifests/leap_repo.pp
@@ -4,4 +4,11 @@ class site_apt::leap_repo {
before => Exec[refresh_apt]
}
+ package { 'leap-keyring':
+ ensure => latest
+ }
+
+ # We wont be able to install the leap-keyring package unless the leap apt
+ # source has been added and apt has been refreshed
+ Exec['refresh_apt'] -> Package['leap-keyring']
}