Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Renaming idrac_pwd to idrac_password #55033

Merged
merged 1 commit into from
Apr 11, 2019
Merged

Renaming idrac_pwd to idrac_password #55033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/ansible/module_utils/remote_management/dellemc/dellemc_idrac.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def __init__(self, module_params):
raise ImportError("Dell EMC OMSDK library is required for this module")
self.idrac_ip = module_params['idrac_ip']
self.idrac_user = module_params['idrac_user']
self.idrac_pwd = module_params['idrac_pwd']
self.idrac_pwd = module_params['idrac_password']
self.idrac_port = module_params['idrac_port']
if not all((self.idrac_ip, self.idrac_user, self.idrac_pwd)):
raise ValueError("hostname, username and password required")
Expand Down
14 changes: 7 additions & 7 deletions lib/ansible/modules/remote_management/dellemc/idrac/idrac_firmware.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
description: iDRAC username.
type: str
required: True
idrac_pwd:
idrac_password:
description: iDRAC user password.
type: str
required: True
Expand All @@ -55,7 +55,7 @@
description: Network share user in the format 'user@domain' or 'domain\\user' if user is
part of a domain else 'user'. This option is mandatory for CIFS Network Share.
type: str
share_pwd:
share_password:
description: Network share user password. This option is mandatory for CIFS Network Share.
type: str
share_mnt:
Expand Down Expand Up @@ -89,10 +89,10 @@
idrac_firmware:
idrac_ip: "192.168.0.1"
idrac_user: "user_name"
idrac_pwd: "user_pwd"
idrac_password: "user_password"
share_name: "192.168.0.0:/share"
share_user: "share_user_name"
share_pwd: "share_user_pwd"
share_password: "share_user_pwd"
share_mnt: "/mnt/share"
reboot: True
job_wait: True
Expand Down Expand Up @@ -152,7 +152,7 @@ def update_firmware(idrac, module):
isFolder=False,
creds=UserCredentials(
module.params['share_user'],
module.params['share_pwd'])
module.params['share_password'])
)

idrac.use_redfish = True
Expand Down Expand Up @@ -181,12 +181,12 @@ def main():
argument_spec={
"idrac_ip": {"required": True, "type": 'str'},
"idrac_user": {"required": True, "type": 'str'},
"idrac_pwd": {"required": True, "type": 'str', "no_log": True},
"idrac_password": {"required": True, "type": 'str', "no_log": True},
"idrac_port": {"required": False, "default": 443, "type": 'int'},

"share_name": {"required": True, "type": 'str'},
"share_user": {"required": False, "type": 'str'},
"share_pwd": {"required": False, "type": 'str', "no_log": True},
"share_password": {"required": False, "type": 'str', "no_log": True},
"share_mnt": {"required": True, "type": 'str'},

"catalog_file_name": {"required": False, "type": 'str', "default": "Catalog.xml"},
Expand Down