summaryrefslogtreecommitdiff
path: root/puppet/modules/site_apt/manifests
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-06-14 12:11:18 -0400
committerMicah Anderson <micah@riseup.net>2013-06-14 12:11:18 -0400
commitbb4b3845130cabffe2e23c7b9112389179a56523 (patch)
treef105d313ca8016106c413197195eb2aaafacdd31 /puppet/modules/site_apt/manifests
parentc67705ca4c6ddec7bff9ede1062c77939a6d56f0 (diff)
parent03cb737490a12813b63801bbf9198e7e4a91a37b (diff)
Merge branch 'bug/leap_keyring_2492' into develop
Change-Id: Idda4e0301b3e349581fef36989706a487b05ecd8
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']
}