mirror of
https://github.com/OpenNebula/one.git
synced 2025-03-21 14:50:08 +03:00
Feature #1112: Continue integration of DatastorePool in Nebula class
This commit is contained in:
parent
e73ef59fc1
commit
354ef28985
@ -260,7 +260,7 @@ private:
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
Nebula():nebula_configuration(0),db(0),vmpool(0),hpool(0),vnpool(0),
|
||||
upool(0),ipool(0),gpool(0),tpool(0),lcm(0),vmm(0),im(0),tm(0),
|
||||
upool(0),ipool(0),gpool(0),tpool(0),dspool(0),lcm(0),vmm(0),im(0),tm(0),
|
||||
dm(0),rm(0),hm(0),authm(0),aclm(0),imagem(0)
|
||||
{
|
||||
const char * nl = getenv("ONE_LOCATION");
|
||||
@ -331,7 +331,7 @@ private:
|
||||
|
||||
if ( dspool != 0)
|
||||
{
|
||||
delete tpool;
|
||||
delete dspool;
|
||||
}
|
||||
|
||||
if ( vmm != 0)
|
||||
|
@ -248,6 +248,7 @@ void Nebula::start()
|
||||
rc += ImagePool::bootstrap(db);
|
||||
rc += VMTemplatePool::bootstrap(db);
|
||||
rc += AclManager::bootstrap(db);
|
||||
rc += DatastorePool::bootstrap(db);
|
||||
|
||||
// Create the versioning table only if bootstrap went well
|
||||
if ( rc == 0 )
|
||||
|
Loading…
x
Reference in New Issue
Block a user