From 3f6d3506c6124ee6db89f5f10fcdc3ff7022d521 Mon Sep 17 00:00:00 2001 From: Jeff Bradberry Date: Thu, 4 Apr 2019 14:25:50 -0400 Subject: [PATCH] Change the artifact file convention for isolated nodes to 'command' since that's what landed in the ansible-runner PR. --- awx/main/isolated/manager.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/awx/main/isolated/manager.py b/awx/main/isolated/manager.py index 7f728518b8..04da23c8f3 100644 --- a/awx/main/isolated/manager.py +++ b/awx/main/isolated/manager.py @@ -39,7 +39,7 @@ class IsolatedManager(object): self.check_callback = check_callback self.idle_timeout = max(60, 2 * settings.AWX_ISOLATED_CONNECTION_TIMEOUT) self.started_at = None - self.captured_config_artifact = False + self.captured_command_artifact = False def build_runner_params(self, hosts, verbosity=1): env = dict(os.environ.items()) @@ -190,15 +190,15 @@ class IsolatedManager(object): extravars=extravars) status, rc = runner_obj.status, runner_obj.rc - if self.check_callback is not None and not self.captured_config_artifact: - config_path = self.path_to('artifacts', self.ident, 'config') + if self.check_callback is not None and not self.captured_command_artifact: + command_path = self.path_to('artifacts', self.ident, 'command') # If the configuration artifact has been synced back, update the model - if os.path.exists(config_path): + if os.path.exists(command_path): try: - with open(config_path, 'r') as f: + with open(command_path, 'r') as f: data = json.load(f) self.check_callback(data) - self.captured_config_artifact = True + self.captured_command_artifact = True except json.decoder.JSONDecodeError: # Just in case it's not fully here yet. pass