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

Minor tweaks for the mesh_code branch from review (#10902)

Browse Source
This commit is contained in:
Alan Rominger
2021-08-18 07:53:12 -04:00
parent 928c35ede5
commit c3ad479fc6
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -181,7 +181,7 @@ init:
receptor --cert-makereq bits=2048 commonname="$$node test cert" dnsname=$$node nodeid=$$node outreq=/etc/receptor/certs/$$node.csr outkey=/etc/receptor/certs/$$node.key; \ receptor --cert-makereq bits=2048 commonname="$$node test cert" dnsname=$$node nodeid=$$node outreq=/etc/receptor/certs/$$node.csr outkey=/etc/receptor/certs/$$node.key; \
receptor --cert-signreq req=/etc/receptor/certs/$$node.csr cacert=/etc/receptor/certs/ca.crt cakey=/etc/receptor/certs/ca.key outcert=/etc/receptor/certs/$$node.crt verify=yes; \ receptor --cert-signreq req=/etc/receptor/certs/$$node.csr cacert=/etc/receptor/certs/ca.crt cakey=/etc/receptor/certs/ca.key outcert=/etc/receptor/certs/$$node.crt verify=yes; \
done; \ done; \
fi; \ fi
# Refresh development environment after pulling new code. # Refresh development environment after pulling new code.
refresh: clean requirements_dev version_file develop migrate refresh: clean requirements_dev version_file develop migrate

1
awx/main/scheduler/task_manager.py
View File

@@ -75,7 +75,6 @@ class TaskManager:
instances_partial = [ instances_partial = [
SimpleNamespace( SimpleNamespace(
obj=instance, obj=instance,
version=instance.version,
node_type=instance.node_type, node_type=instance.node_type,
remaining_capacity=instance.remaining_capacity, remaining_capacity=instance.remaining_capacity,
capacity=instance.capacity, capacity=instance.capacity,

8
awx/main/wsbroadcast.py
View File

@@ -32,7 +32,13 @@ def unwrap_broadcast_msg(payload: dict):
def get_broadcast_hosts(): def get_broadcast_hosts():
Instance = apps.get_model('main', 'Instance') Instance = apps.get_model('main', 'Instance')
instances = Instance.objects.exclude(hostname=Instance.objects.me().hostname).exclude(version__startswith='ansible-runner-').order_by('hostname').values('hostname', 'ip_address').distinct() instances = (
Instance.objects.exclude(hostname=Instance.objects.me().hostname)
.exclude(node_type='execution')
.order_by('hostname')
.values('hostname', 'ip_address')
.distinct()
)
return {i['hostname']: i['ip_address'] or i['hostname'] for i in instances} return {i['hostname']: i['ip_address'] or i['hostname'] for i in instances}

2
awx/settings/development.py
View File

@@ -125,8 +125,6 @@ if "pytest" in sys.modules:
} }
} }
CELERYBEAT_SCHEDULE['cluster_heartbeat']['schedule'] = timedelta(seconds=10)
CLUSTER_HOST_ID = socket.gethostname() CLUSTER_HOST_ID = socket.gethostname()
AWX_CALLBACK_PROFILE = True AWX_CALLBACK_PROFILE = True