Merge branch 'develop'

6 files changed, 31 insertions, 0 deletions

diff --git a/puppet/modules/lsb b/puppet/modules/lsb
deleted file mode 160000
-Subproject 3742c1a00c5602154a81834443ec5b0ca32c4ca
diff --git a/puppet/modules/lsb/.gitrepo b/puppet/modules/lsb/.gitrepo
new file mode 100644
index 00000000..640efc53
--- /dev/null
+++ b/puppet/modules/lsb/.gitrepo
@@ -0,0 +1,11 @@
+; DO NOT EDIT (unless you know what you are doing)
+;
+; This subdirectory is a git "subrepo", and this file is maintained by the
+; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
+;
+[subrepo]
+	remote = https://leap.se/git/puppet_lsb
+	branch = master
+	commit = bac64e7595a6d4f8d409b024a26bddb1c06188d6
+	parent = 2e384e68fb867d8ba7178c4398e35653ab567538
+	cmdver = 0.3.0
diff --git a/puppet/modules/lsb/manifests/base.pp b/puppet/modules/lsb/manifests/base.pp
new file mode 100644
index 00000000..9dc8d5a4
--- /dev/null
+++ b/puppet/modules/lsb/manifests/base.pp
@@ -0,0 +1,3 @@
+class lsb::base {
+  package{'lsb': ensure => present }
+}
diff --git a/puppet/modules/lsb/manifests/centos.pp b/puppet/modules/lsb/manifests/centos.pp
new file mode 100644
index 00000000..b7006187
--- /dev/null
+++ b/puppet/modules/lsb/manifests/centos.pp
@@ -0,0 +1,5 @@
+class lsb::centos inherits lsb::base {
+  Package['lsb']{
+    name => 'redhat-lsb',
+  }
+}
diff --git a/puppet/modules/lsb/manifests/debian.pp b/puppet/modules/lsb/manifests/debian.pp
new file mode 100644
index 00000000..c32070f3
--- /dev/null
+++ b/puppet/modules/lsb/manifests/debian.pp
@@ -0,0 +1,6 @@
+class lsb::debian inherits lsb::base {
+  Package['lsb']{
+    name => 'lsb-release',
+    require => undef,
+  }
+}
diff --git a/puppet/modules/lsb/manifests/init.pp b/puppet/modules/lsb/manifests/init.pp
new file mode 100644
index 00000000..85b34e1f
--- /dev/null
+++ b/puppet/modules/lsb/manifests/init.pp
@@ -0,0 +1,6 @@
+class lsb {
+  case $::operatingsystem {
+    debian,ubuntu: { include lsb::debian }
+    centos: { include lsb::centos }
+  }
+}