diff --git a/zun/compute/manager.py b/zun/compute/manager.py index ba4c77c70..88e80c853 100644 --- a/zun/compute/manager.py +++ b/zun/compute/manager.py @@ -580,7 +580,9 @@ class Manager(periodic_task.PeriodicTasks): if run: return self.driver.execute_run(exec_id, command) else: - return {'exec_id': exec_id, + return {'output': None, + 'exit_code': None, + 'exec_id': exec_id, 'url': CONF.docker.docker_remote_api_url} except exception.DockerError as e: LOG.error("Error occurred while calling Docker exec API: %s", diff --git a/zun/container/docker/driver.py b/zun/container/docker/driver.py index 352726027..1fa306baa 100644 --- a/zun/container/docker/driver.py +++ b/zun/container/docker/driver.py @@ -559,7 +559,10 @@ class DockerDriver(driver.ContainerDriver): raise exception.Conflict(_( "Timeout on executing command: %s") % command) inspect_res = docker.exec_inspect(exec_id) - return {"output": output, "exit_code": inspect_res['ExitCode']} + return {"output": output, + "exit_code": inspect_res['ExitCode'], + "exec_id": None, + "url": None} def execute_resize(self, exec_id, height, width): height = int(height)