Ensure the rename is done everywhere and wrap the service in a

manage_service param.

3 files changed, 13 insertions, 10 deletions

diff --git a/manifests/install.pp b/manifests/install.pp
index f9c61f1..b91538a 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -1,10 +1,10 @@
 class ntp::install(
-  $package_ensure = $ntp::package_ensure,
+  $ensure_package = $ntp::ensure_package,
   $package_name   = $ntp::package_name,
 ) {
 
   package { 'ntp':
-    ensure => $package_ensure,
+    ensure => $ensure_package,
     name   => $package_name,
   }
 
diff --git a/manifests/service.pp b/manifests/service.pp
index aea661d..5ec4323 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -1,6 +1,7 @@
 class ntp::service (
-  $ensure_service = $ntp::ensure_service,
   $enable_service = $ntp::enable_service,
+  $ensure_service = $ntp::ensure_service,
+  $manage_service = $ntp::manage_service,
   $service_name   = $ntp::service_name,
 ) {
 
@@ -9,12 +10,14 @@ class ntp::service (
   }
   validate_bool($enable_service)
 
-  service { 'ntp':
-    ensure     => $ensure_service,
-    enable     => $enable_service,
-    name       => $service_name,
-    hasstatus  => true,
-    hasrestart => true,
+  if $manage_service == true {
+    service { 'ntp':
+      ensure     => $ensure_service,
+      enable     => $enable_service,
+      name       => $service_name,
+      hasstatus  => true,
+      hasrestart => true,
+    }
   }
 
 }
diff --git a/spec/classes/ntp_spec.rb b/spec/classes/ntp_spec.rb
index 527c53f..65d8e3b 100644
--- a/spec/classes/ntp_spec.rb
+++ b/spec/classes/ntp_spec.rb
@@ -160,7 +160,7 @@ describe 'ntp' do
           subject.should contain_service('ntp').with_ensure('stopped')
         end
         it 'should allow package ensure to be overridden' do
-          params[:package_ensure] = 'latest'
+          params[:ensure_package] = 'latest'
           subject.should contain_package('ntp').with_ensure('latest')
         end
         it 'should allow template to be overridden' do