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

{sudo,su}_user does not imply become

Browse source
This commit is contained in:
Brian Coca 2015-10-02 00:27:04 -04:00
parent 57372906aa
commit c27bd4fab0
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/ansible/playbook/become.py
View file

@ -22,7 +22,13 @@ __metaclass__ = type
from ansible import constants as C from ansible import constants as C
from ansible.errors import AnsibleError, AnsibleParserError from ansible.errors import AnsibleError, AnsibleParserError
from ansible.playbook.attribute import Attribute, FieldAttribute from ansible.playbook.attribute import Attribute, FieldAttribute
#from ansible.utils.display import deprecated
try:
from __main__ import display
display = display
except ImportError:
from ansible.utils.display import Display
display = Display()
class Become: class Become:
@ -66,26 +72,24 @@ class Become:
if 'sudo' in ds: if 'sudo' in ds:
ds['become'] = ds['sudo'] ds['become'] = ds['sudo']
del ds['sudo'] del ds['sudo']
else:
ds['become'] = True
if 'sudo_user' in ds: if 'sudo_user' in ds:
ds['become_user'] = ds['sudo_user'] ds['become_user'] = ds['sudo_user']
del ds['sudo_user'] del ds['sudo_user']
#deprecated("Instead of sudo/sudo_user, use become/become_user and set become_method to 'sudo' (default)") display.deprecated("Instead of sudo/sudo_user, use become/become_user and make sure become_method is 'sudo' (default)")
elif 'su' in ds or 'su_user' in ds: elif 'su' in ds or 'su_user' in ds:
ds['become_method'] = 'su' ds['become_method'] = 'su'
if 'su' in ds: if 'su' in ds:
ds['become'] = ds['su'] ds['become'] = ds['su']
del ds['su'] del ds['su']
else:
ds['become'] = True
if 'su_user' in ds: if 'su_user' in ds:
ds['become_user'] = ds['su_user'] ds['become_user'] = ds['su_user']
del ds['su_user'] del ds['su_user']
#deprecated("Instead of su/su_user, use become/become_user and set become_method to 'su' (default is sudo)") display.deprecated("Instead of su/su_user, use become/become_user and set become_method to 'su' (default is sudo)")
# if we are becoming someone else, but some fields are unset, # if we are becoming someone else, but some fields are unset,
# make sure they're initialized to the default config values # make sure they're initialized to the default config values