Merge pull request #137 from matburt/openstack_inventory_support

Openstack inventory support
This commit is contained in:
Matthew Jones
2015-04-14 12:43:20 -04:00
1120 changed files with 368209 additions and 2413 deletions

View File

@@ -56,7 +56,7 @@ PERMISSION_TYPE_CHOICES = [
(PERM_JOBTEMPLATE_CREATE, _('Create a Job Template')),
]
CLOUD_INVENTORY_SOURCES = ['ec2', 'rax', 'vmware', 'gce', 'azure', 'custom']
CLOUD_INVENTORY_SOURCES = ['ec2', 'rax', 'vmware', 'gce', 'azure', 'openstack', 'custom']
VERBOSITY_CHOICES = [
(0, '0 (Normal)'),