Adding OpenStack v3 cred type

awx/main/models/base.py

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

awx/main/models/credential.py

@@ -34,6 +34,7 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique):
         ('gce',    _('Google Compute Engine')),
         ('azure',  _('Microsoft Azure')),
         ('openstack', _('OpenStack')),
+        ('openstack_v3', _('OpenStack V3')),
     ]
 
     BECOME_METHOD_CHOICES = [
@@ -210,10 +211,19 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique):
         host = self.host or ''
         if not host and self.kind == 'vmware':
             raise ValidationError('Host required for VMware credential.')
-        if not host and self.kind == 'openstack':
+        if not host and self.kind in ('openstack', 'openstack_v3'):
             raise ValidationError('Host required for OpenStack credential.')
         return host
 
+    def clean_domain(self):
+        """For case of Keystone v3 identity service that requires a
+        `domain`, that a domain is provided.
+        """
+        domain = self.domain or ''
+        if not domain and self.kind == 'openstack_v3':
+            raise ValidationError('Domain required for OpenStack with Keystone v3.')
+        return domain
+
     def clean_username(self):
         username = self.username or ''
         if not username and self.kind == 'aws':
@@ -223,7 +233,7 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique):
                                   'credential.')
         if not username and self.kind == 'vmware':
             raise ValidationError('Username required for VMware credential.')
-        if not username and self.kind == 'openstack':
+        if not username and self.kind in ('openstack', 'openstack_v3'):
             raise ValidationError('Username required for OpenStack credential.')
         return username
 
@@ -235,13 +245,13 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique):
             raise ValidationError('API key required for Rackspace credential.')
         if not password and self.kind == 'vmware':
             raise ValidationError('Password required for VMware credential.')
-        if not password and self.kind == 'openstack':
+        if not password and self.kind in ('openstack', 'openstack_v3'):
             raise ValidationError('Password or API key required for OpenStack credential.')
         return password
 
     def clean_project(self):
         project = self.project or ''
-        if self.kind == 'openstack' and not project:
+        if self.kind in ('openstack', 'openstack_v3') and not project:
             raise ValidationError('Project name required for OpenStack credential.')
         return project
 

awx/main/models/inventory.py

@@ -748,6 +748,7 @@ class InventorySourceOptions(BaseModel):
         ('azure',  _('Microsoft Azure')),
         ('vmware', _('VMware vCenter')),
         ('openstack', _('OpenStack')),
+        ('openstack_v3', _('OpenStack V3')),
         ('custom', _('Custom Script')),
     ]
 
@@ -976,6 +977,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