External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-20 20:50:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

Delete dead code from get_or_register, move, and test

Browse Source
This commit is contained in:
Alan Rominger
2022-03-30 13:35:42 -04:00
parent ef0f6ca248
commit 6c56f2b35b
3 changed files with 56 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
awx/main/managers.py
View File

@@ -2,7 +2,6 @@
# All Rights Reserved.
import logging
import os
from django.db import models
from django.conf import settings
from django.db.models.functions import Lower
@@ -164,23 +163,6 @@ class InstanceManager(models.Manager):
instance = self.create(hostname=hostname, ip_address=ip_address, node_type=node_type, **create_defaults, **uuid_option)
return (True, instance)
def get_or_register(self):
if settings.AWX_AUTO_DEPROVISION_INSTANCES:
from awx.main.management.commands.register_queue import RegisterQueue
pod_ip = os.environ.get('MY_POD_IP')
if settings.IS_K8S:
registered = self.register(ip_address=pod_ip, node_type='control', uuid=settings.SYSTEM_UUID)
else:
registered = self.register(ip_address=pod_ip, uuid=settings.SYSTEM_UUID)
RegisterQueue(settings.DEFAULT_CONTROL_PLANE_QUEUE_NAME, 100, 0, [], is_container_group=False).register()
RegisterQueue(
settings.DEFAULT_EXECUTION_QUEUE_NAME, 100, 0, [], is_container_group=True, pod_spec_override=settings.DEFAULT_EXECUTION_QUEUE_POD_SPEC_OVERRIDE
).register()
return registered
else:
return (False, self.me())
class InstanceGroupManager(models.Manager):
"""A custom manager class for the Instance model.