diff --git a/awx/main/management/commands/inventory_import.py b/awx/main/management/commands/inventory_import.py index dd1b8f3eca..c5cb9d5181 100644 --- a/awx/main/management/commands/inventory_import.py +++ b/awx/main/management/commands/inventory_import.py @@ -1006,12 +1006,6 @@ class Command(BaseCommand): except re.error: raise CommandError('invalid regular expression for --host-filter') - ''' - TODO: Remove this deprecation when we remove support for rax.py - ''' - if self.source == "rax.py": - logger.info("Rackspace inventory sync is Deprecated in Tower 3.1.0 and support for Rackspace will be removed in a future release.") - begin = time.time() self.load_inventory_from_database() diff --git a/awx_collection/plugins/modules/tower_group.py b/awx_collection/plugins/modules/tower_group.py index 8b9677da79..0c16e8a9ce 100644 --- a/awx_collection/plugins/modules/tower_group.py +++ b/awx_collection/plugins/modules/tower_group.py @@ -48,7 +48,7 @@ options: source: description: - The source to use for this group. - choices: ["manual", "file", "ec2", "rax", "vmware", "gce", "azure", "azure_rm", "openstack", "satellite6" , "cloudforms", "custom"] + choices: ["manual", "file", "ec2", "vmware", "gce", "azure", "azure_rm", "openstack", "satellite6" , "cloudforms", "custom"] type: str source_regions: description: @@ -124,7 +124,7 @@ def main(): inventory=dict(required=True), variables=dict(), credential=dict(), - source=dict(choices=["manual", "file", "ec2", "rax", "vmware", + source=dict(choices=["manual", "file", "ec2", "vmware", "gce", "azure", "azure_rm", "openstack", "satellite6", "cloudforms", "custom"]), source_regions=dict(), diff --git a/awxkit/awxkit/utils/__init__.py b/awxkit/awxkit/utils/__init__.py index f426872272..2526983817 100644 --- a/awxkit/awxkit/utils/__init__.py +++ b/awxkit/awxkit/utils/__init__.py @@ -33,7 +33,6 @@ cloud_types = ( 'openstack_v2', 'openstack_v3', 'rhv', - 'rax', 'satellite6', 'tower', 'vmware')