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

Merge pull request #11614 from jbradberry/register_peers_warn_2cycles

Browse Source 
Only do a warning on 2-cycles for the register_peers command
This commit is contained in:
Jeff Bradberry
2022-01-27 10:25:19 -05:00
committed by GitHub
parent ef7d5e6004 fdbf3ed279
commit 627bde9e9e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/management/commands/register_peers.py
View File

@@ -1,3 +1,5 @@
import warnings
from django.core.management.base import BaseCommand, CommandError from django.core.management.base import BaseCommand, CommandError
from django.db import transaction from django.db import transaction
@@ -45,7 +47,7 @@ class Command(BaseCommand):
peers = set(options['peers'] or options['exact']) peers = set(options['peers'] or options['exact'])
incoming = set(InstanceLink.objects.filter(target=nodes[options['source']]).values_list('source__hostname', flat=True)) incoming = set(InstanceLink.objects.filter(target=nodes[options['source']]).values_list('source__hostname', flat=True))
if peers & incoming: if peers & incoming:
raise CommandError(f"Source node {options['source']} cannot link to nodes already peering to it: {peers & incoming}.") warnings.warn(f"Source node {options['source']} should not link to nodes already peering to it: {peers & incoming}.")
if options['peers']: if options['peers']:
missing_peers = set(options['peers']) - set(nodes) missing_peers = set(options['peers']) - set(nodes)