External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-17 04:31:21 -03:30
Code Issues Packages Projects Releases Wiki Activity

Change credential to return 'ssh_password' instead of 'password' when value is set to 'ASK'.

Browse Source
This commit is contained in:
Chris Church 2015-04-08 15:32:45 -04:00
parent 53bc065d32
commit 9500e9b63e
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
awx/main/models/ad_hoc_commands.py
View File

@ -113,14 +113,10 @@ class AdHocCommand(UnifiedJob):
@property
def passwords_needed_to_start(self):
'''Return list of password field names needed to start the job.'''
needed = []
if self.credential:
for pw in self.credential.passwords_needed:
if pw == 'password':
needed.append('ssh_password')
else:
needed.append(pw)
return needed
return self.credential.passwords_needed
else:
return []
@classmethod
def _get_parent_field_name(cls):

4
awx/main/models/credential.py
View File

@ -148,7 +148,7 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique):
)
@property
def needs_password(self):
def needs_ssh_password(self):
return self.kind == 'ssh' and self.password == 'ASK'
@property
@ -176,7 +176,7 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique):
@property
def passwords_needed(self):
needed = []
for field in ('password', 'become_password', 'ssh_key_unlock', 'vault_password'):
for field in ('ssh_password', 'become_password', 'ssh_key_unlock', 'vault_password'):
if getattr(self, 'needs_%s' % field):
needed.append(field)
return needed

10
awx/main/models/jobs.py
View File

@ -140,14 +140,10 @@ class JobOptions(BaseModel):
@property
def passwords_needed_to_start(self):
'''Return list of password field names needed to start the job.'''
needed = []
if self.credential:
for pw in self.credential.passwords_needed:
if pw == 'password':
needed.append('ssh_password')
else:
needed.append(pw)
return needed
return self.credential.passwords_needed
else:
return []
class JobTemplate(UnifiedJobTemplate, JobOptions):
'''