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

"force=" code under the file module is problematic, remove it

Browse source
This commit is contained in:
Michael DeHaan 2012-10-16 18:14:42 -04:00
parent bad010856c
commit 0b6c55ac81
1 changed files with 1 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
file
View file

@ -113,12 +113,6 @@ options:
description: description:
- accepts only C(default) as value. This will restore a file's SELinux context - accepts only C(default) as value. This will restore a file's SELinux context
in the policy. Does nothing if no default value is available. in the policy. Does nothing if no default value is available.
force:
required: false
default: null
choices: []
description:
- force is required when changing an existing file to a directory, or a link to a directory, and so on. Use this with caution.
examples: examples:
- code: file path=/etc/foo.conf owner=foo group=foo mode=0644 - code: file path=/etc/foo.conf owner=foo group=foo mode=0644
description: Example from Ansible Playbooks description: Example from Ansible Playbooks
@ -325,7 +319,6 @@ def main():
state = dict(choices=['file','directory','link','absent'], default='file'), state = dict(choices=['file','directory','link','absent'], default='file'),
path = dict(aliases=['dest', 'name'], required=True), path = dict(aliases=['dest', 'name'], required=True),
src = dict(), src = dict(),
force = dict(default='no', choices=['yes', 'no']),
mode = dict(), mode = dict(),
owner = dict(), owner = dict(),
group = dict(), group = dict(),
@ -346,7 +339,6 @@ def main():
src = params.get('src', None) src = params.get('src', None)
if src: if src:
src = os.path.expanduser(src) src = os.path.expanduser(src)
force = module.boolean(params['force'])
if src is not None and os.path.isdir(path): if src is not None and os.path.isdir(path):
params['path'] = path = os.path.join(path, os.path.basename(src)) params['path'] = path = os.path.join(path, os.path.basename(src))
@ -399,7 +391,7 @@ def main():
module_fail_json(path=path, msg=str(e)) module_fail_json(path=path, msg=str(e))
module_exit_json(path=path, changed=True) module_exit_json(path=path, changed=True)
if prev_state != 'absent' and prev_state != state and not force: if prev_state != 'absent' and prev_state != state:
module_fail_json(path=path, msg='refusing to convert between %s and %s for %s' % (prev_state, state, src)) module_fail_json(path=path, msg='refusing to convert between %s and %s for %s' % (prev_state, state, src))
if prev_state == 'absent' and state == 'absent': if prev_state == 'absent' and state == 'absent':
@ -423,13 +415,6 @@ def main():
if prev_state == 'absent': if prev_state == 'absent':
os.makedirs(path) os.makedirs(path)
changed = True changed = True
elif prev_state != 'directory' and force:
try:
os.unlink(path)
except Exception, e:
module_fail_json(path=path, msg=str(e))
os.makedirs(path)
changed = True
# set modes owners and context as needed # set modes owners and context as needed
changed = set_context_if_different(path, secontext, changed) changed = set_context_if_different(path, secontext, changed)
@ -451,16 +436,6 @@ def main():
if prev_state == 'absent': if prev_state == 'absent':
os.symlink(src, path) os.symlink(src, path)
changed = True changed = True
elif prev_state != 'link' and force:
try:
if os.path.isfile(path):
os.unlink(path)
else:
shutil.rmtree(path, ignore_errors=False, onerror=rmtree_error)
except Exception, e:
module_fail_json(path=path, msg=str(e))
os.symlink(src, path)
changed = True
elif prev_state == 'link': elif prev_state == 'link':
old_src = os.readlink(path) old_src = os.readlink(path)
if not os.path.isabs(old_src): if not os.path.isabs(old_src):