(MODULES-3994) Manage services on Puppet 4

Previously a bug in the logic including the puppet_agent::service class
prevented it from being applied on non-PE installs using Puppet 4. Fix
it so that services are now managed for non-PE installs under Puppet 4.

manifests/init.pp

@@ -147,7 +147,7 @@
 
     # On windows, our MSI handles the services
     # On PE AIO nodes, PE Agent nodegroup is managing the services
-    if $::osfamily != 'windows' and (!is_pe or versioncmp($::clientversion, '4.0.0') < 0) {
+    if $::osfamily != 'windows' and (!$is_pe or versioncmp($::clientversion, '4.0.0') < 0) {
       class { '::puppet_agent::service':
         require => Class['::puppet_agent::install'],
       }

spec/classes/puppet_agent_spec.rb

@@ -139,13 +139,13 @@ def global_facts(facts, os)
               it { is_expected.to contain_package('puppet-agent').with_ensure(package_version) }
             end
 
-            if Puppet.version < "4.0.0" && !params[:is_pe]
-              it { is_expected.to contain_class('puppet_agent::service').that_requires('puppet_agent::install') }
+            if Puppet.version < "4.0.0" || (os !~ /sles/ && os !~ /solaris/)
+              it { is_expected.to contain_class('puppet_agent::service').that_requires('Class[puppet_agent::install]') }
             end
 
             if params[:service_names].nil? &&
-              !(facts[:osfamily] == 'Solaris' and facts[:operatingsystemmajrelease] == '11') &&
-              Puppet.version < "4.0.0" && !params[:is_pe]
+              !(facts[:osfamily] == 'Solaris' && facts[:operatingsystemmajrelease] == '11') &&
+              (Puppet.version < "4.0.0" || os !~ /sles/)
               it { is_expected.to contain_service('puppet') }
               it { is_expected.to contain_service('mcollective') }
             else