External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-23 15:38:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6919 from AlanCoding/ask_vault

Browse Source 
include vault_credentials in ask_for_passwords and launch summary
This commit is contained in:
Alan Rominger 2017-07-07 09:25:11 -04:00 committed by GitHub
commit 447624fd47
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
awx/api/serializers.py
View File

@ -3097,9 +3097,10 @@ class JobLaunchSerializer(BaseSerializer):
def get_defaults(self, obj):
ask_for_vars_dict = obj._ask_for_vars_dict()
ask_for_vars_dict['vault_credential'] = False
defaults_dict = {}
for field in ask_for_vars_dict:
if field in ('inventory', 'credential'):
if field in ('inventory', 'credential', 'vault_credential'):
defaults_dict[field] = dict(
name=getattrd(obj, '%s.name' % field, None),
id=getattrd(obj, '%s.pk' % field, None))

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

@ -213,10 +213,12 @@ 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:
return self.credential.passwords_needed
else:
return []
needed.extend(self.credential.passwords_needed)
if self.vault_credential:
needed.extend(self.vault_credential.passwords_needed)
return needed
class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, ResourceMixin):