diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 1bde975373..3e5c5909f3 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -3061,6 +3061,10 @@ class AWXReceptorJob: if self.work_type == 'ansible-runner' and ((res is None) or (getattr(res, 'rc', None) is None)): execution_node_health_check(self.task.instance.execution_node) + @property + def sign_work(self): + return False if settings.IS_K8S else True + def _run_internal(self, receptor_ctl): # Create a socketpair. Where the left side will be used for writing our payload # (private data dir, kwargs). The right side will be passed to Receptor for @@ -3077,8 +3081,7 @@ class AWXReceptorJob: _kw['node'] = self.task.instance.execution_node use_stream_tls = get_conn_type(_kw['node'], receptor_ctl).name == "STREAMTLS" _kw['tlsclient'] = get_tls_client(use_stream_tls) - - result = receptor_ctl.submit_work(worktype=self.work_type, payload=sockout.makefile('rb'), params=self.receptor_params, signwork=True, **_kw) + result = receptor_ctl.submit_work(worktype=self.work_type, payload=sockout.makefile('rb'), params=self.receptor_params, signwork=self.sign_work, **_kw) self.unit_id = result['unitid'] self.task.update_model(self.task.instance.pk, work_unit_id=result['unitid']) diff --git a/awx/main/utils/receptor.py b/awx/main/utils/receptor.py index ece0f5fcec..b92b57c46a 100644 --- a/awx/main/utils/receptor.py +++ b/awx/main/utils/receptor.py @@ -3,6 +3,7 @@ import yaml import time from receptorctl.socket_interface import ReceptorControl +from django.conf import settings from enum import Enum, unique @@ -73,12 +74,12 @@ def run_until_complete(node, timing_data=None, **kwargs): use_stream_tls = getattr(get_conn_type(node, receptor_ctl), 'name', None) == "STREAMTLS" kwargs.setdefault('tlsclient', get_tls_client(use_stream_tls)) - kwargs.setdefault('signwork', True) kwargs.setdefault('ttl', '20s') kwargs.setdefault('payload', '') transmit_start = time.time() - result = receptor_ctl.submit_work(worktype='ansible-runner', node=node, **kwargs) + sign_work = False if settings.IS_K8S else True + result = receptor_ctl.submit_work(worktype='ansible-runner', node=node, signwork=sign_work, **kwargs) unit_id = result['unitid'] run_start = time.time()