mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Merge pull request #3017 from sergevanginderachter/roles-script
Add roles support for the script module
This commit is contained in:
commit
fd77804bff
3 changed files with 8 additions and 1 deletions
|
@ -52,6 +52,7 @@ The top level of the directory would contain files and directories like so::
|
|||
ntp.conf.j2 # <------- templates end in .j2
|
||||
files/ #
|
||||
bar.txt # <-- files for use with the copy resource
|
||||
foo.sh # <-- script files for use with the script resource
|
||||
|
||||
webtier/ # same kind of structure as "common" was above, done for the webtier role
|
||||
monitoring/ # ""
|
||||
|
|
|
@ -488,6 +488,7 @@ This designates the following behaviors, for each role 'x':
|
|||
- If roles/x/handlers/main.yml exists, handlers listed therein will be added to the play
|
||||
- If roles/x/vars/main.yml exists, variables listed therein will be added to the play
|
||||
- Any copy tasks can reference files in roles/x/files/ without having to path them relatively or absolutely
|
||||
- Any script tasks can reference scripts in roles/x/files/ without having to path them relatively or absolutely
|
||||
- Any template tasks can reference files in roles/x/templates/ without having to path them relatively or absolutely
|
||||
|
||||
If any files are not present, they are just ignored. So it's ok to not have a 'vars/' subdirectory for the role,
|
||||
|
@ -526,6 +527,8 @@ If you want to define certain tasks to happen before AND after roles are applied
|
|||
- shell: echo 'hello'
|
||||
roles:
|
||||
- { role: some_role }
|
||||
tasks:
|
||||
- shell: echo 'still busy'
|
||||
post_tasks:
|
||||
- shell: echo 'goodbye'
|
||||
|
||||
|
|
|
@ -41,7 +41,10 @@ class ActionModule(object):
|
|||
# FIXME: error handling
|
||||
args = " ".join(tokens[1:])
|
||||
source = template.template(self.runner.basedir, source, inject)
|
||||
source = utils.path_dwim(self.runner.basedir, source)
|
||||
if '_original_file' in inject:
|
||||
source = utils.path_dwim_relative(inject['_original_file'], 'files', source, self.runner.basedir)
|
||||
else:
|
||||
source = utils.path_dwim(self.runner.basedir, source)
|
||||
|
||||
# transfer the file to a remote tmp location
|
||||
source = source.replace('\x00','') # why does this happen here?
|
||||
|
|
Loading…
Reference in a new issue