Skip to content

Commit cbb6052

Browse files
authored
Merge pull request #4 from choria-plugins/0200
(misc) release 0.20.0
2 parents 59ebbd7 + 3d54399 commit cbb6052

File tree

4 files changed

+41
-3
lines changed

4 files changed

+41
-3
lines changed

files/mcollective/agent/bolt_tasks.ddl

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,15 @@ action "run_and_wait", :description => "Runs a Puppet Task that was previously d
7777
:default => "{}",
7878
:maxlength => 102400
7979

80+
input :run_as,
81+
:prompt => "Run As",
82+
:description => "User to run the task as",
83+
:type => :string,
84+
:validation => ".+",
85+
:optional => true,
86+
:default => nil,
87+
:maxlength => 32
88+
8089
output :task_id,
8190
:description => "The ID the task was created with",
8291
:display_as => "Task ID",
@@ -165,6 +174,15 @@ action "run_no_wait", :description => "Runs a Puppet Task that was previously do
165174
:default => "{}",
166175
:maxlength => 102400
167176

177+
input :run_as,
178+
:prompt => "Run As",
179+
:description => "User to run the task as",
180+
:type => :string,
181+
:validation => ".+",
182+
:optional => true,
183+
:default => nil,
184+
:maxlength => 32
185+
168186
output :task_id,
169187
:description => "The ID the task was created with",
170188
:display_as => "Task ID",

files/mcollective/agent/bolt_tasks.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,15 @@
101101
"optional": false,
102102
"validation": "^.+$",
103103
"maxlength": 102400
104+
},
105+
"run_as": {
106+
"prompt": "Run As",
107+
"description": "User to run the task as",
108+
"type": "string",
109+
"default": null,
110+
"optional": true,
111+
"validation": ".+",
112+
"maxlength": 32
104113
}
105114
},
106115
"output": {
@@ -233,6 +242,15 @@
233242
"optional": true,
234243
"validation": "^.+$",
235244
"maxlength": 102400
245+
},
246+
"run_as": {
247+
"prompt": "Run As",
248+
"description": "User to run the task as",
249+
"type": "string",
250+
"default": null,
251+
"optional": true,
252+
"validation": ".+",
253+
"maxlength": 32
236254
}
237255
},
238256
"output": {

files/mcollective/agent/bolt_tasks.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ class Bolt_tasks < RPC::Agent
3737
"task" => request[:task],
3838
"input_method" => request[:input_method],
3939
"input" => request[:input],
40-
"files" => JSON.parse(request[:files])
40+
"files" => JSON.parse(request[:files]),
41+
"run_as" => request[:run_as]
4142
}
4243

4344
unless tasks.cached?(task["files"])
@@ -77,7 +78,8 @@ class Bolt_tasks < RPC::Agent
7778
"task" => request[:task],
7879
"input_method" => request[:input_method],
7980
"input" => request[:input],
80-
"files" => JSON.parse(request[:files])
81+
"files" => JSON.parse(request[:files]),
82+
"run_as" => request[:run_as]
8183
}
8284

8385
status = tasks.run_task_command(reply[:task_id], task, false, request.caller)

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "choria-mcollective_agent_bolt_tasks",
3-
"version": "0.19.0",
3+
"version": "0.20.0",
44
"author": "R.I.Pienaar <[email protected]>",
55
"summary": "Puppet Tasks integration for Choria",
66
"license": "Apache-2.0",

0 commit comments

Comments
 (0)