Merge pull request #446 from treydock/instance-service_name

Add service_name parameter to tomcat::instance

Author: daianamezdrea

manifests/instance.pp

@@ -43,6 +43,8 @@
 #   ```
 # @param copy_from_home_mode
 #   Specifies the file mode when copying the initial config files from `catalina_home` to `catalina_base`. Valid options: a string containing a standard Linux mode.
+# @param service_name
+#   Name of the service when managing the service
 # @param install_from_source
 #   Specifies whether or not the instance should be installed from source.
 # @param source_url
@@ -75,6 +77,7 @@
   $manage_copy_from_home  = true,
   $copy_from_home_list    = undef,
   $copy_from_home_mode    = '0660',
+  $service_name           = undef,
 
   #used for single installs. Deprecated.
   $install_from_source    = undef,
@@ -203,6 +206,7 @@
   }
   if $_manage_service {
     tomcat::service { $name:
+      service_name  => $service_name,
       catalina_home => $_catalina_home,
       catalina_base => $_catalina_base,
       java_home     => $java_home,

spec/defines/instance_spec.rb

@@ -439,4 +439,20 @@
     it { is_expected.not_to contain_file('/opt/apache-tomcat/foo/webapps') }
     it { is_expected.not_to contain_file('/opt/apache-tomcat/foo/work') }
   end
+  context 'manage service init with service_name' do
+    let :facts do
+      default_facts
+    end
+    let :params do
+      {
+        source_url: 'http://mirror.nexcess.net/apache/tomcat/tomcat-8/v8.0.8/bin/apache-tomcat-8.0.8.tar.gz',
+        manage_service: true,
+        use_jsvc: false,
+        use_init: true,
+        service_name: 'tomcat-default',
+      }
+    end
+
+    it { is_expected.to contain_service('tomcat-default') }
+  end
 end