Merge pull request #1418 from tarrall/CHEF-5265

CHEF-5265 - upstart service not working correctly when called with parameters

2 files changed, 9 insertions, 1 deletions

diff --git a/lib/chef/provider/service/upstart.rb b/lib/chef/provider/service/upstart.rb
index 98780e4b72..c81a8a50dc 100644
--- a/lib/chef/provider/service/upstart.rb
+++ b/lib/chef/provider/service/upstart.rb
@@ -43,7 +43,8 @@ class Chef
 
           run_context.node
 
-          @job = @new_resource.service_name
+          # dup so we can mutate @job
+          @job = @new_resource.service_name.dup
 
           if @new_resource.parameters
             @new_resource.parameters.each do |key, value|
diff --git a/spec/unit/provider/service/upstart_service_spec.rb b/spec/unit/provider/service/upstart_service_spec.rb
index 154527a7da..efe4e0481f 100644
--- a/spec/unit/provider/service/upstart_service_spec.rb
+++ b/spec/unit/provider/service/upstart_service_spec.rb
@@ -88,6 +88,13 @@ describe Chef::Provider::Service::Upstart do
       @provider.load_current_resource
     end
 
+    it "should not change the service name when parameters are specified" do
+      @new_resource.parameters({ "OSD_ID" => "2" })
+      @provider = Chef::Provider::Service::Upstart.new(@new_resource, @run_context)
+      @provider.current_resource = @current_resource
+      @new_resource.service_name.should == @current_resource.service_name
+    end
+
     it "should run '/sbin/status rsyslog'" do
       @provider.should_receive(:popen4).with("/sbin/status rsyslog").and_return(@status)
       @provider.load_current_resource