External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-09 12:09:20 -02:30
Code Issues Packages Projects Releases Wiki Activity

convey OpenStack verify_ssl defaults in the CredentialType schema

Browse Source
This commit is contained in:
Ryan Petrello
2019-02-19 16:08:13 -05:00
parent 9f04fbe4a4
commit b1a33869dc
7 changed files with 132 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/main/models/credential/__init__.py
View File

@@ -445,6 +445,9 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique, ResourceMixin):
try:
return decrypt_field(self, field_name)
except AttributeError:
for field in self.credential_type.inputs.get('fields', []):
if field['id'] == field_name and 'default' in field:
return field['default']
if 'default' in kwargs:
return kwargs['default']
raise AttributeError
@@ -452,6 +455,9 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique, ResourceMixin):
return self.inputs[field_name]
if 'default' in kwargs:
return kwargs['default']
for field in self.credential_type.inputs.get('fields', []):
if field['id'] == field_name and 'default' in field:
return field['default']
raise AttributeError(field_name)
def has_input(self, field_name):
@@ -973,7 +979,8 @@ ManagedCredentialType(
}, {
'id': 'verify_ssl',
'label': ugettext_noop('Verify SSL'),
'type': 'boolean'
'type': 'boolean',
'default': True,
}],
'required': ['username', 'password', 'host', 'project']
}