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

Merge pull request #2450 from ryanpetrello/iso-deprovision-fix

Browse Source 
don't call rabbitmqctl forget_cluster_node for isolated instances

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2018-10-16 14:10:35 +00:00
committed by GitHub
parent e2a1b7902c f3e73bbed8
commit 12c8994faf
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
awx/main/management/commands/deprovision_instance.py
View File

@@ -41,14 +41,18 @@ class Command(BaseCommand):
with advisory_lock('instance_registration_%s' % hostname): with advisory_lock('instance_registration_%s' % hostname):
instance = Instance.objects.filter(hostname=hostname) instance = Instance.objects.filter(hostname=hostname)
if instance.exists(): if instance.exists():
isolated = instance.first().is_isolated()
instance.delete() instance.delete()
print("Instance Removed") print("Instance Removed")
result = subprocess.Popen("rabbitmqctl forget_cluster_node rabbitmq@{}".format(hostname), shell=True).wait() if isolated:
if result != 0:
print("Node deprovisioning may have failed when attempting to "
"remove the RabbitMQ instance {} from the cluster".format(hostname))
else:
print('Successfully deprovisioned {}'.format(hostname)) print('Successfully deprovisioned {}'.format(hostname))
else:
result = subprocess.Popen("rabbitmqctl forget_cluster_node rabbitmq@{}".format(hostname), shell=True).wait()
if result != 0:
print("Node deprovisioning may have failed when attempting to "
"remove the RabbitMQ instance {} from the cluster".format(hostname))
else:
print('Successfully deprovisioned {}'.format(hostname))
print('(changed: True)') print('(changed: True)')
else: else:
print('No instance found matching name {}'.format(hostname)) print('No instance found matching name {}'.format(hostname))