Revision 34af39e8 lib/cmdlib/instance_operation.py
b/lib/cmdlib/instance_operation.py | ||
---|---|---|
184 | 184 |
|
185 | 185 |
""" |
186 | 186 |
env = BuildInstanceHookEnvByObject(self, self.instance) |
187 |
env["TIMEOUT"] = self.op.timeout
|
|
187 |
env["SHUTDOWN_TIMEOUT"] = self.op.shutdown_timeout
|
|
188 | 188 |
return env |
189 | 189 |
|
190 | 190 |
def BuildHooksNodes(self): |
... | ... | |
230 | 230 |
assert self.op.ignore_offline_nodes |
231 | 231 |
self.LogInfo("Primary node offline, marked instance as stopped") |
232 | 232 |
else: |
233 |
result = self.rpc.call_instance_shutdown(self.instance.primary_node, |
|
234 |
self.instance, |
|
235 |
self.op.timeout, self.op.reason) |
|
233 |
result = self.rpc.call_instance_shutdown( |
|
234 |
self.instance.primary_node, |
|
235 |
self.instance, |
|
236 |
self.op.shutdown_timeout, self.op.reason) |
|
236 | 237 |
msg = result.fail_msg |
237 | 238 |
if msg: |
238 | 239 |
self.LogWarning("Could not shutdown instance: %s", msg) |
Also available in: Unified diff