From 162af0ee25596701c699e9937f6aa3d08019a3eb Mon Sep 17 00:00:00 2001 From: Trey Dockendorf Date: Tue, 26 Jan 2021 17:33:18 -0500 Subject: [PATCH] Do not sort spank plugin arguments --- spec/defines/slurm_spank_spec.rb | 6 +++--- templates/spank/plugin.conf.erb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spec/defines/slurm_spank_spec.rb b/spec/defines/slurm_spank_spec.rb index 1ef7eb03..a7e475c9 100644 --- a/spec/defines/slurm_spank_spec.rb +++ b/spec/defines/slurm_spank_spec.rb @@ -51,7 +51,7 @@ it do verify_fragment_contents(catalogue, 'plugstack.conf-x11', [ - 'optional x11.so helpertask_cmd=2>/tmp/log ssh_cmd=ssh', + 'optional x11.so ssh_cmd=ssh helpertask_cmd=2>/tmp/log', ]) end end @@ -61,7 +61,7 @@ it do verify_fragment_contents(catalogue, 'plugstack.conf-x11', [ - 'optional x11.so helpertask_cmd=2>/tmp/log ssh_cmd=ssh', + 'optional x11.so ssh_cmd=ssh helpertask_cmd=2>/tmp/log', ]) end end @@ -103,7 +103,7 @@ it do verify_fragment_contents(catalogue, 'plugstack.conf-auks', [ - 'required auks.so conf=/etc/auks/auks.conf default=enabled minimum_uid=0 spankstackcred=no', + 'required auks.so conf=/etc/auks/auks.conf default=enabled spankstackcred=no minimum_uid=0', ]) end end diff --git a/templates/spank/plugin.conf.erb b/templates/spank/plugin.conf.erb index 9d97edba..4692ef5a 100644 --- a/templates/spank/plugin.conf.erb +++ b/templates/spank/plugin.conf.erb @@ -4,11 +4,11 @@ values << (@required ? "required" : "optional") values << @plugin case @arguments when Hash - @arguments.keys.sort.each do |k| - values << "#{k}=#{@arguments[k]}" + @arguments.each_pair do |k,v| + values << "#{k}=#{v}" end when Array - @arguments.sort.each do |a| + @arguments.each do |a| values << a end when String