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

Merge branch 'devel' of github.com:ansible/ansible-tower into merge-devel

Browse Source
This commit is contained in:
Akita Noek
2016-03-24 13:51:00 -04:00
parent 683f9cacbb dd977c608b
commit 5baa784ce2
32 changed files with 588 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -733,6 +733,7 @@ class InventorySourceOptions(BaseModel):
('azure', _('Microsoft Azure')),
('vmware', _('VMware vCenter')),
('openstack', _('OpenStack')),
('openstack_v3', _('OpenStack V3')),
('custom', _('Custom Script')),
]
@@ -961,6 +962,11 @@ class InventorySourceOptions(BaseModel):
"""I don't think openstack has regions"""
return [('all', 'All')]
@classmethod
def get_openstack_v3_region_choices(self):
"""Defer to the behavior of openstack"""
return self.get_openstack_region_choices()
def clean_credential(self):
if not self.source:
return None