Merge pull request voxpupuli#534 from 3flex/configurable_service_name

Configurable service name
cegeka · Dec 20, 2014 · c04469c · c04469c
2 parents 930f21f + bd565c7
commit c04469c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -109,6 +109,7 @@
   $configtest_enable              = false,
   $service_ensure                 = running,
   $service_restart                = '/etc/init.d/nginx configtest && /etc/init.d/nginx restart',
+  $service_name                   = undef,
   ### END Service Configuration ###
 
   ### START Hiera Lookups ###
@@ -289,6 +290,7 @@
     configtest_enable => $configtest_enable,
     service_ensure    => $service_ensure,
     service_restart   => $service_restart,
+    service_name      => $service_name,
   }
 
   create_resources('::nginx::resource::upstream', $nginx_upstreams)

diff --git a/manifests/service.pp b/manifests/service.pp
@@ -17,6 +17,7 @@
   $configtest_enable = $::nginx::configtest_enable,
   $service_restart   = $::nginx::service_restart,
   $service_ensure    = $::nginx::service_ensure,
+  $service_name      = 'nginx',
 ) {
 
   $service_enable = $service_ensure ? {
@@ -35,6 +36,7 @@
 
   service { 'nginx':
     ensure     => $service_ensure_real,
+    name       => $service_name,
     enable     => $service_enable,
     hasstatus  => true,
     hasrestart => true,

diff --git a/spec/classes/service_spec.rb b/spec/classes/service_spec.rb
@@ -5,6 +5,7 @@
       :configtest_enable => false,
       :service_restart => '/etc/init.d/nginx configtest && /etc/init.d/nginx restart',
       :service_ensure => 'running',
+      :service_name => 'nginx',
   } end
 
   context "using default parameters" do
@@ -25,6 +26,7 @@
       :configtest_enable => true,
       :service_restart   => '/etc/init.d/nginx configtest && /etc/init.d/nginx restart',
       :service_ensure    => 'running',
+      :service_name      => 'nginx',
     } end
     it { is_expected.to contain_service('nginx').with_restart('/etc/init.d/nginx configtest && /etc/init.d/nginx restart') }
 
@@ -33,9 +35,16 @@
         :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 {
+      :service_name => 'nginx14',
+    } end
+    it { is_expected.to contain_service('nginx').with_name('nginx14') }
+  end
 end