From 22363972bf736050d95f86d94915f8451f8ecaa4 Mon Sep 17 00:00:00 2001
From: Ugo Bellavance <ubellavance@atq.qc.ca>
Date: Tue, 2 May 2017 10:53:03 -0400
Subject: [PATCH] Changed manifest/repo/debian.pp so that it doesn't use an LSB
 fact, then remove the installation of the lsb package requirement.

---
 manifests/init.pp         | 1 -
 manifests/repo/debian.pp  | 2 +-
 manifests/requirements.pp | 8 --------
 3 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 manifests/requirements.pp

diff --git a/manifests/init.pp b/manifests/init.pp
index cfc74b9..864dc34 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -100,7 +100,6 @@
   validate_re($admin_api_key_name, ['^\w{5,20}$','api_key_name is required and must be 5-20 characters.'])
   validate_re($admin_api_key_secret, ['^\w{64}$','api_key_secret is required and must be 64 characters.'])
   anchor { 'zendserver::begin': } ->
-  class { '::zendserver::requirements': } ->
   class { '::zendserver::install': } ->
   class { '::zendserver::sdk::install': } ->
   class { '::zendserver::bootstrap': } ~>
diff --git a/manifests/repo/debian.pp b/manifests/repo/debian.pp
index 7dfb77d..8e8caa1 100644
--- a/manifests/repo/debian.pp
+++ b/manifests/repo/debian.pp
@@ -22,7 +22,7 @@
 
   case $::operatingsystem {
     'Ubuntu' : {
-      if $::lsbdistrelease + 0 >= 14.04 {
+      if $::operatingsystemrelease + 0 >= 14.04 {
         $zend_repository = "http://repos.zend.com/zend-server/${zendserver::zend_server_version}/deb_apache2.4"
       } else {
         $zend_repository = "http://repos.zend.com/zend-server/${zendserver::zend_server_version}/deb_ssl1.0"
diff --git a/manifests/requirements.pp b/manifests/requirements.pp
deleted file mode 100644
index a138582..0000000
--- a/manifests/requirements.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# == Class: zendserver::requirements
-#  Manage all requirements for Zend Server installation. This class should not be included directly in the manifest.
-#
-class zendserver::requirements inherits zendserver {
-    package { $zendserver::package_lsbrelease:
-      ensure => installed,
-    }
-}
\ No newline at end of file