Changed manifest/repo/debian.pp so that it doesn't use an LSB fact, t…

…hen remove the installation of the lsb package requirement.
zend-patterns · May 2, 2017 · 2236397 · 2236397
1 parent c8d6c1c
commit 2236397
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git 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
@@ -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