Skip to content

slapos
slapos
Commit 5cc00f00 authored by Cédric de Saint Martin's avatar Cédric de Saint Martin
Browse files
Options

Fix 0f8e52e7 merge.

parent 7ec7fad7
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
slapos/recipe/request.py
View file @ 5cc00f00
...@@ -127,7 +127,7 @@ class Recipe(object): ...@@ -127,7 +127,7 @@ class Recipe(object):
return_parameters) return_parameters)
if not slave: if not slave:
# XXX: convention: should be instance-guid # XXX: convention: should be instance-guid
options['instance_guid'] = self.instance.getId() options['instance_guid'] = self.instance.getInstanceGuid()
except (slapmodule.NotFoundError, slapmodule.ServerError, slapmodule.ResourceNotReady) as exc: except (slapmodule.NotFoundError, slapmodule.ServerError, slapmodule.ResourceNotReady) as exc:
self._raise_request_exception = exc self._raise_request_exception = exc
self._raise_request_exception_formatted = traceback.format_exc() self._raise_request_exception_formatted = traceback.format_exc()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7