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

Fix job templates credential checks.

Browse Source
This commit is contained in:
Luke Sneeringer
2014-07-29 13:09:56 -05:00
parent cf96240556
commit cc2e45b44e
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,7 @@ from jsonfield import JSONField
from polymorphic import PolymorphicModel from polymorphic import PolymorphicModel
# AWX # AWX
from awx.main.constants import CLOUD_PROVIDERS
from awx.main.models.base import * from awx.main.models.base import *
from awx.main.models.unified_jobs import * from awx.main.models.unified_jobs import *
from awx.main.utils import encrypt_field, decrypt_field, ignore_inventory_computed_fields from awx.main.utils import encrypt_field, decrypt_field, ignore_inventory_computed_fields
@@ -119,14 +120,18 @@ class JobOptions(BaseModel):
def clean_credential(self): def clean_credential(self):
cred = self.credential cred = self.credential
if cred and cred.kind != 'ssh': if cred and cred.kind != 'ssh':
raise ValidationError('Credential kind must be "ssh"') raise ValidationError(
'You must provide a machine / SSH credential.',
)
return cred return cred
def clean_cloud_credential(self): def clean_cloud_credential(self):
cred = self.cloud_credential cred = self.cloud_credential
if cred and cred.kind not in ('aws', 'rax'): if cred and cred.kind not in CLOUD_PROVIDERS + ('aws',):
raise ValidationError('Cloud credential kind must be "aws" or ' raise ValidationError(
'"rax"') 'Must provide a credential for a cloud provider, such as '
'Amazon Web Services or Rackspace.',
)
return cred return cred