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

Makefile

@@ -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-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; \
-	fi; \
+	fi
 
 # Refresh development environment after pulling new code.
 refresh: clean requirements_dev version_file develop migrate

awx/main/scheduler/task_manager.py

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

awx/main/wsbroadcast.py

@@ -32,7 +32,13 @@ def unwrap_broadcast_msg(payload: dict):
 
 def get_broadcast_hosts():
     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}
 
 

awx/settings/development.py

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