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

set default uuid

Browse Source
This commit is contained in:
Jim Ladd
2021-09-01 15:57:25 -07:00
parent f02099e8b7
commit 262cd3c695
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/managers.py
View File

@@ -115,8 +115,6 @@ class InstanceManager(models.Manager):
raise RuntimeError("No instance found with the current cluster host id")
def register(self, uuid=None, hostname=None, ip_address=None, node_type='hybrid', defaults=None):
if not uuid:
uuid = str(uuid4())
if not hostname:
hostname = settings.CLUSTER_HOST_ID
with advisory_lock('instance_registration_%s' % hostname):
@@ -149,7 +147,7 @@ class InstanceManager(models.Manager):
return (False, instance)
# Create new instance, and fill in default values
create_defaults = dict(capacity=0, uuid=uuid)
create_defaults = dict(capacity=0)
if defaults is not None:
create_defaults.update(defaults)
if node_type == 'execution' and 'version' not in create_defaults: