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

In progress: Adding GCE to inventory source.

Browse Source
This commit is contained in:
Luke Sneeringer
2014-07-21 15:20:38 -05:00
parent 4c887c5614
commit c6f7c1d2da
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
awx/main/models/inventory.py
View File

@@ -736,6 +736,7 @@ class InventorySourceOptions(BaseModel):
('file', _('Local File, Directory or Script')), ('file', _('Local File, Directory or Script')),
('rax', _('Rackspace Cloud Servers')), ('rax', _('Rackspace Cloud Servers')),
('ec2', _('Amazon EC2')), ('ec2', _('Amazon EC2')),
('gce', _('Google Compute Engine')),
] ]
class Meta: class Meta:
@@ -826,13 +827,15 @@ class InventorySourceOptions(BaseModel):
return None return None
cred = self.credential cred = self.credential
if cred: if cred:
if self.source == 'ec2' and cred.kind != 'aws': # If a credential was provided, it's important that it matches
raise ValidationError('Credential kind must be "aws" for an ' # the actual inventory source being used (Amazon requires Amazon
'"ec2" source') # credentials; Rackspace requires Rackspace credentials; etc...)
if self.source == 'rax' and cred.kind != 'rax': if self.source.replace('ec2', 'awx') != cred.kind:
raise ValidationError('Credential kind must be "rax" for a ' raise ValidationError(
'"rax" source') 'Cloud-based inventory sources (such as %s) require '
elif self.source in ('ec2', 'rax'): 'credentials for the matching cloud service.' % self.source
)
elif self.source in ('ec2', 'rax', 'gce'):
raise ValidationError('Credential is required for a cloud source') raise ValidationError('Credential is required for a cloud source')
return cred return cred

4
awx/ui/static/js/forms/Source.js
View File

@@ -47,7 +47,7 @@ angular.module('SourceFormDefinition', [])
source_regions: { source_regions: {
label: 'Regions', label: 'Regions',
type: 'text', type: 'text',
ngShow: "source && (source.value == 'rax' || source.value == 'ec2')", ngShow: "source && (source.value == 'rax' || source.value == 'ec2' || source.value == 'gce')",
addRequired: false, addRequired: false,
editRequired: false, editRequired: false,
awMultiselect: 'source_region_choices', awMultiselect: 'source_region_choices',
@@ -155,4 +155,4 @@ angular.module('SourceFormDefinition', [])
related: { } related: { }
}); });

11
awx/ui/static/js/helpers/Groups.js
View File

@@ -1027,6 +1027,15 @@ function($compile, SchedulerInit, Rest, Wait, SetSchedulesInnerDialogSize, Sched
callback: 'choicesReadyGroup' callback: 'choicesReadyGroup'
}); });
GetChoices({
scope: sources_scope,
url: GetBasePath('inventory_sources'),
field: 'source_regions',
variable: 'gce_regions',
choice_name: 'gce_region_choices',
callback: 'choicesReadyGroup'
});
Wait('start'); Wait('start');
if (parent_scope.removeAddTreeRefreshed) { if (parent_scope.removeAddTreeRefreshed) {
@@ -1864,4 +1873,4 @@ function($compile, SchedulerInit, Rest, Wait, SetSchedulesInnerDialogSize, Sched
}; };
} }
]); ]);