Merge pull request voxpupuli#921 from wyardley/fix_service_calls_issu…

…e_916

Remove broken configtest_enable option

manifests/init.pp

@@ -112,10 +112,8 @@
   ### END Package Configuration ###
 
   ### START Service Configuation ###
-  $configtest_enable              = false,
   $service_ensure                 = running,
   $service_flags                  = undef,
-  $service_restart                = '/etc/init.d/nginx reload',
   $service_name                   = undef,
   $service_manage                 = true,
   ### END Service Configuration ###
@@ -305,12 +303,10 @@
   Class['::nginx::package'] -> Class['::nginx::config'] ~> Class['::nginx::service']
 
   class { '::nginx::service':
-    configtest_enable => $configtest_enable,
-    service_ensure    => $service_ensure,
-    service_restart   => $service_restart,
-    service_name      => $service_name,
-    service_flags     => $service_flags,
-    service_manage    => $service_manage,
+    service_ensure => $service_ensure,
+    service_name   => $service_name,
+    service_flags  => $service_flags,
+    service_manage => $service_manage,
   }
 
   create_resources('nginx::resource::upstream', $nginx_upstreams)

manifests/service.pp

@@ -14,8 +14,6 @@
 #
 # This class file is not called directly
 class nginx::service(
-  $configtest_enable = false,
-  $service_restart   = '/etc/init.d/nginx reload',
   $service_ensure    = 'running',
   $service_name      = 'nginx',
   $service_flags     = undef,
@@ -60,9 +58,4 @@
     }
   }
 
-  if $configtest_enable == true {
-    Service['nginx'] {
-      restart => $service_restart,
-    }
-  }
 }

spec/classes/service_spec.rb

@@ -2,8 +2,6 @@
 describe 'nginx::service' do
   let :params do
     {
-      configtest_enable: false,
-      service_restart: '/etc/init.d/nginx reload',
       service_ensure: 'running',
       service_name: 'nginx',
       service_manage: true
@@ -23,30 +21,6 @@
     it { is_expected.to contain_service('nginx').without_restart }
   end
 
-  describe 'when configtest_enable => true' do
-    let :params do
-      {
-        configtest_enable: true,
-        service_restart: '/etc/init.d/nginx reload',
-        service_ensure: 'running',
-        service_name: 'nginx'
-      }
-    end
-    it { is_expected.to contain_service('nginx').with_restart('/etc/init.d/nginx reload') }
-
-    context "when service_restart => 'a restart command'" do
-      let :params do
-        {
-          configtest_enable: true,
-          service_restart: 'a restart command',
-          service_ensure: 'running',
-          service_name: 'nginx'
-        }
-      end
-      it { is_expected.to contain_service('nginx').with_restart('a restart command') }
-    end
-  end
-
   describe "when service_name => 'nginx14" do
     let :params do
       {