openstack/zun
Code Issues Proposed changes

Remove the unused url for container exec

Browse Source 
This url is not needed anymore since we are using websocket
proxy for doing interactive execute now.

Depends-On: I68d2b3daaaf8fb551d00774f01ad0ee88538f7ae
Change-Id: I5792d01fcb3f360864c49ea7368dc470181a5a75
Closes-Bug: #1735076
This commit is contained in:
Hongbin Lu
2018-06-05 00:58:05 +00:00
parent fb0dcf1a18
commit 64745c1fc5
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zun/compute/manager.py
View File

@@ -731,11 +731,9 @@ class Manager(periodic_task.PeriodicTasks):
interactive) interactive)
if run: if run:
output, exit_code = self.driver.execute_run(exec_id, command) output, exit_code = self.driver.execute_run(exec_id, command)
# TODO(hongbin): remove url once bug #1735076 is fixed
return {"output": output, return {"output": output,
"exit_code": exit_code, "exit_code": exit_code,
"exec_id": None, "exec_id": None,
"url": None,
"token": None} "token": None}
else: else:
token = uuidutils.generate_uuid() token = uuidutils.generate_uuid()
@@ -744,11 +742,9 @@ class Manager(periodic_task.PeriodicTasks):
context, container_id=container.id, exec_id=exec_id, context, container_id=container.id, exec_id=exec_id,
url=url, token=token) url=url, token=token)
exec_instace.create(context) exec_instace.create(context)
# TODO(hongbin): remove url once bug #1735076 is fixed
return {'output': None, return {'output': None,
'exit_code': None, 'exit_code': None,
'exec_id': exec_id, 'exec_id': exec_id,
'url': url,
'token': token} 'token': token}
except exception.DockerError as e: except exception.DockerError as e:
LOG.error("Error occurred while calling Docker exec API: %s", LOG.error("Error occurred while calling Docker exec API: %s",