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

Change the artifact to also capture the actual envvars data

Browse Source
This commit is contained in:
Jeff Bradberry
2019-04-02 16:49:40 -04:00
parent cac48e7cfb
commit 32286a9d49
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/main/isolated/manager.py
View File

@@ -189,12 +189,12 @@ class IsolatedManager(object):
extravars=extravars) extravars=extravars)
status, rc = runner_obj.status, runner_obj.rc status, rc = runner_obj.status, runner_obj.rc
if self.check_callback is not None: if self.check_callback is not None:
command_path = self.path_to('artifacts', self.ident, 'command') config_path = self.path_to('artifacts', self.ident, 'config')
# If the command artifact has been synced back, update the model # If the configuration artifact has been synced back, update the model
if os.path.exists(command_path): if os.path.exists(config_path):
with open(command_path, 'r') as f: with open(config_path, 'r') as f:
data = json.load(f) data = json.load(f)
self.check_callback(data['command'], data['cwd'], self.runner_params['envvars'].copy()) self.check_callback(data)
self.consume_events(dispatcher) self.consume_events(dispatcher)
last_check = time.time() last_check = time.time()

8
awx/main/tasks.py
View File

@@ -1077,14 +1077,14 @@ class BaseTask(object):
self.instance = self.update_model(self.instance.pk, job_args=json.dumps(runner_config.command), self.instance = self.update_model(self.instance.pk, job_args=json.dumps(runner_config.command),
job_cwd=runner_config.cwd, job_env=job_env) job_cwd=runner_config.cwd, job_env=job_env)
def check_handler(self, command, cwd, env): def check_handler(self, config):
''' '''
IsolatedManager callback triggered by the repeated checks of the isolated node IsolatedManager callback triggered by the repeated checks of the isolated node
''' '''
self.instance = self.update_model(self.instance.pk, self.instance = self.update_model(self.instance.pk,
job_args=command, job_args=json.dumps(config['command']),
job_cwd=cwd, job_cwd=config['cwd'],
job_env=build_safe_env(env)) job_env=config['env'])
@with_path_cleanup @with_path_cleanup