Merge remote-tracking branch 'origin/develop'0.2.2

Conflicts:
	provider_base/services/webapp.json

1 files changed, 14 insertions, 0 deletions

diff --git a/puppet/modules/site_apt/manifests/leap_repo.pp b/puppet/modules/site_apt/manifests/leap_repo.pp
new file mode 100644
index 00000000..6b3d9919
--- /dev/null
+++ b/puppet/modules/site_apt/manifests/leap_repo.pp
@@ -0,0 +1,14 @@
+class site_apt::leap_repo {
+  apt::sources_list { 'leap.list':
+    content => 'deb http://deb.leap.se/debian stable main',
+    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']
+}