Revision 64b4f0d5 src/vm/VirtualMachinePool.cc
src/vm/VirtualMachinePool.cc | ||
---|---|---|
25 | 25 |
/* -------------------------------------------------------------------------- */ |
26 | 26 |
|
27 | 27 |
time_t VirtualMachinePool::_monitor_expiration; |
28 |
bool VirtualMachinePool::_submit_on_hold; |
|
28 | 29 |
|
29 | 30 |
/* -------------------------------------------------------------------------- */ |
30 | 31 |
/* -------------------------------------------------------------------------- */ |
... | ... | |
35 | 36 |
const string& hook_location, |
36 | 37 |
const string& remotes_location, |
37 | 38 |
vector<const Attribute *>& restricted_attrs, |
38 |
time_t expire_time) |
|
39 |
time_t expire_time, |
|
40 |
bool on_hold) |
|
39 | 41 |
: PoolSQL(db, VirtualMachine::table, false) |
40 | 42 |
{ |
41 | 43 |
const VectorAttribute * vattr; |
... | ... | |
50 | 52 |
bool state_hook = false; |
51 | 53 |
|
52 | 54 |
_monitor_expiration = expire_time; |
55 |
_submit_on_hold = on_hold; |
|
53 | 56 |
|
54 | 57 |
if ( _monitor_expiration == 0 ) |
55 | 58 |
{ |
... | ... | |
222 | 225 |
const string& gname, |
223 | 226 |
VirtualMachineTemplate * vm_template, |
224 | 227 |
int * oid, |
225 |
string& error_str, |
|
226 |
bool on_hold) |
|
228 |
string& error_str) |
|
227 | 229 |
{ |
228 | 230 |
VirtualMachine * vm; |
229 | 231 |
|
... | ... | |
232 | 234 |
// ------------------------------------------------------------------------ |
233 | 235 |
vm = new VirtualMachine(-1, uid, gid, uname, gname, vm_template); |
234 | 236 |
|
235 |
if (on_hold == true) |
|
237 |
if (_submit_on_hold == true)
|
|
236 | 238 |
{ |
237 | 239 |
vm->state = VirtualMachine::HOLD; |
238 | 240 |
} |
Also available in: Unified diff