cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3017 from sergevanginderachter/roles-script

Browse source 
Add roles support for the script module
This commit is contained in:
Michael DeHaan 2013-05-29 15:54:18 -07:00
commit fd77804bff
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docsite/latest/rst/bestpractices.rst
View file

@ -52,6 +52,7 @@ The top level of the directory would contain files and directories like so::
ntp.conf.j2 # <------- templates end in .j2 ntp.conf.j2 # <------- templates end in .j2
files/ # files/ #
bar.txt # <-- files for use with the copy resource 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 webtier/ # same kind of structure as "common" was above, done for the webtier role
monitoring/ # "" monitoring/ # ""

3
docsite/latest/rst/playbooks.rst
View file

@ -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/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 - 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 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 - 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, 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' - shell: echo 'hello'
roles: roles:
- { role: some_role } - { role: some_role }
tasks:
- shell: echo 'still busy'
post_tasks: post_tasks:
- shell: echo 'goodbye' - shell: echo 'goodbye'

5
lib/ansible/runner/action_plugins/script.py
View file

@ -41,7 +41,10 @@ class ActionModule(object):
# FIXME: error handling # FIXME: error handling
args = " ".join(tokens[1:]) args = " ".join(tokens[1:])
source = template.template(self.runner.basedir, source, inject) 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 # transfer the file to a remote tmp location
source = source.replace('\x00','') # why does this happen here? source = source.replace('\x00','') # why does this happen here?