saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #33983 from twangboy/fix_docs_join_domain

Browse source 
Clarify the `account_exists` parameter
This commit is contained in:
Mike Place 2016-06-13 18:11:48 -07:00 • committed by GitHub
commit 444c15792c
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/modules/win_system.py
View file

@ -468,7 +468,10 @@ def join_domain(domain,
``ou=computers,ou=departm_432,dc=my-company,dc=com``
:param bool account_exists:
Needs to be set to ``True`` to allow re-using an existing account
If set to ``True`` the computer will only join the domain if the account
already exists. If set to ``False`` the computer account will be created
if it does not exist, otherwise it will use the existing account.
Default is False
:param bool restart: Restarts the computer after a successful join
.. versionadded:: 2015.5.7
@ -561,7 +564,8 @@ def unjoin_domain(username=None,
.. versionadded:: 2015.8.2
:param bool disable:
Disable the user account in Active Directory. True to disable.
Disable the computer account in Active Directory. True to disable.
Default is False
:param bool restart: Restart the computer after successful unjoin