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

include vault_credentials in passwords and launch summary

Browse Source
This commit is contained in:
AlanCoding
2017-07-07 07:57:34 -04:00
parent ed3e03644b
commit a2e88a9cdf
2 changed files with 7 additions and 4 deletions
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): def get_defaults(self, obj):
ask_for_vars_dict = obj._ask_for_vars_dict() ask_for_vars_dict = obj._ask_for_vars_dict()
ask_for_vars_dict['vault_credential'] = False
defaults_dict = {} defaults_dict = {}
for field in ask_for_vars_dict: for field in ask_for_vars_dict:
if field in ('inventory', 'credential'): if field in ('inventory', 'credential', 'vault_credential'):
defaults_dict[field] = dict( defaults_dict[field] = dict(
name=getattrd(obj, '%s.name' % field, None), name=getattrd(obj, '%s.name' % field, None),
id=getattrd(obj, '%s.pk' % 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 @property
def passwords_needed_to_start(self): def passwords_needed_to_start(self):
'''Return list of password field names needed to start the job.''' '''Return list of password field names needed to start the job.'''
needed = []
if self.credential: if self.credential:
return self.credential.passwords_needed needed.extend(self.credential.passwords_needed)
else: if self.vault_credential:
return [] needed.extend(self.vault_credential.passwords_needed)
return needed
class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, ResourceMixin): class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, ResourceMixin):