1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-23 22:50:09 +03:00

Bug #3465: Update onedb import-slave command

(cherry picked from commit 02009a3826780340e8277d8b6960c379dc8bfcd8)
This commit is contained in:
Carlos Martín 2014-12-18 18:49:18 +01:00
parent ad73f9a7c8
commit a5cd9f1293

View File

@ -29,7 +29,7 @@ include OpenNebula
module OneDBImportSlave
VERSION = "4.6.0"
LOCAL_VERSION = "4.5.80"
LOCAL_VERSION = "4.9.80"
def check_db_version(master_db_version, slave_db_version)
if ( master_db_version[:version] != VERSION ||
@ -247,7 +247,7 @@ EOT
@slave_db.run "CREATE TABLE image_pool (oid INTEGER PRIMARY KEY, name VARCHAR(128), body MEDIUMTEXT, uid INTEGER, gid INTEGER, owner_u INTEGER, group_u INTEGER, other_u INTEGER, UNIQUE(name,uid) );"
@slave_db.run "ALTER TABLE network_pool RENAME TO old_network_pool;"
@slave_db.run "CREATE TABLE network_pool (oid INTEGER PRIMARY KEY, name VARCHAR(128), body MEDIUMTEXT, uid INTEGER, gid INTEGER, owner_u INTEGER, group_u INTEGER, other_u INTEGER, cid INTEGER, UNIQUE(name,uid));"
@slave_db.run "CREATE TABLE network_pool (oid INTEGER PRIMARY KEY, name VARCHAR(128), body MEDIUMTEXT, uid INTEGER, gid INTEGER, owner_u INTEGER, group_u INTEGER, other_u INTEGER, cid INTEGER, pid INTEGER, UNIQUE(name,uid));"
@slave_db.run "ALTER TABLE template_pool RENAME TO old_template_pool;"
@slave_db.run "CREATE TABLE template_pool (oid INTEGER PRIMARY KEY, name VARCHAR(128), body MEDIUMTEXT, uid INTEGER, gid INTEGER, owner_u INTEGER, group_u INTEGER, other_u INTEGER);"
@ -864,7 +864,8 @@ EOT
:owner_u => row[:owner_u],
:group_u => row[:group_u],
:other_u => row[:other_u],
:cid => row[:cid])
:cid => row[:cid],
:pid => row[:pid])
end
db.fetch("SELECT * FROM old_vm_pool") do |row|