External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1144 from chrismeyersfsu/fix-auto_reprovision

Browse Source 
delay looking up settings SYSTEM_UUID
This commit is contained in:
Chris Meyers
2018-03-28 10:32:24 -04:00
committed by GitHub
parent bc34a74b7e eef6f7ecb0
commit fe0e873108
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/managers.py
View File

@@ -87,7 +87,11 @@ class InstanceManager(models.Manager):
return node[0] return node[0]
raise RuntimeError("No instance found with the current cluster host id") raise RuntimeError("No instance found with the current cluster host id")
def register(self, uuid=settings.SYSTEM_UUID, hostname=settings.CLUSTER_HOST_ID): def register(self, uuid=None, hostname=None):
if not uuid:
uuid = settings.SYSTEM_UUID
if not hostname:
hostname = settings.CLUSTER_HOST_ID
with advisory_lock('instance_registration_%s' % hostname): with advisory_lock('instance_registration_%s' % hostname):
instance = self.filter(hostname=hostname) instance = self.filter(hostname=hostname)
if instance.exists(): if instance.exists():