mirror of
https://github.com/ansible/awx.git
synced 2026-01-15 20:00:43 -03:30
Merge pull request #6060 from wenottingham/todo-or-todont
Remove the rax support specified in the linked TODO Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
commit
a65fd497c6
@ -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()
|
||||
|
||||
|
||||
@ -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(),
|
||||
|
||||
@ -33,7 +33,6 @@ cloud_types = (
|
||||
'openstack_v2',
|
||||
'openstack_v3',
|
||||
'rhv',
|
||||
'rax',
|
||||
'satellite6',
|
||||
'tower',
|
||||
'vmware')
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user