Merge pull request #1411 from wwitzel3/more-rht-integration

RedHat Inventory Integrations
This commit is contained in:
Akita Noek
2016-04-07 12:56:12 -05:00
9 changed files with 517 additions and 18 deletions

View File

@@ -725,13 +725,15 @@ class InventorySourceOptions(BaseModel):
'''
SOURCE_CHOICES = [
('', _('Manual')),
('file', _('Local File, Directory or Script')),
('rax', _('Rackspace Cloud Servers')),
('ec2', _('Amazon EC2')),
('gce', _('Google Compute Engine')),
('azure', _('Microsoft Azure')),
('', _('Manual')),
('file', _('Local File, Directory or Script')),
('rax', _('Rackspace Cloud Servers')),
('ec2', _('Amazon EC2')),
('gce', _('Google Compute Engine')),
('azure', _('Microsoft Azure')),
('vmware', _('VMware vCenter')),
('foreman', _('Satellite 6')),
('cloudforms', _('CloudForms')),
('openstack', _('OpenStack')),
('custom', _('Custom Script')),
]