cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [2/2] git commit: updated refs/heads/master to 694391a
Date Thu, 20 Jun 2013 11:15:01 GMT
image_data_store is not part of vm_template anymore

Revert "CLOUDSTACK-1744: It's due to db upgrade issue. On master,
deploydb will upgrade db to 4.2, which will update vm_template's
image_data_store_id, while deploydb-simulator adds a new column in
vm_template table, which doesn't set image_data_store_id, thus causing
NPE."

This reverts commit 33937c980eaae5f2e8dbb5b21f59bdb1a89a70be.

Conflicts:
	setup/db/templates.simulator.sql

Signed-off-by: Prasanna Santhanam <tsp@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c295341c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c295341c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c295341c

Branch: refs/heads/master
Commit: c295341cbd5ff08cbeda187aca019575d1812a71
Parents: 2e0abcc
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Thu Jun 20 14:56:35 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Thu Jun 20 16:44:49 2013 +0530

----------------------------------------------------------------------
 setup/db/templates.simulator.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c295341c/setup/db/templates.simulator.sql
----------------------------------------------------------------------
diff --git a/setup/db/templates.simulator.sql b/setup/db/templates.simulator.sql
index bd7ce59..5f9b67d 100755
--- a/setup/db/templates.simulator.sql
+++ b/setup/db/templates.simulator.sql
@@ -16,7 +16,7 @@
 -- under the License.
 
 
-INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm,
bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured,
cross_zones, hypervisor_type, image_data_store_id)
-    VALUES (100, UUID(), 'simulator-domR', 'SystemVM Template (simulator)', 0, now(), 'SYSTEM',
0, 64, 1, 'http://download.cloud.com/templates/acton/acton-systemvm-02062012.vhd.bz2', '',
0, 'SystemVM Template (simulator)', 'VHD', 15, 0, 1, 'Simulator', 1);
-INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm,
bits, account_id, url, checksum, enable_password, display_text,  format, guest_os_id, featured,
cross_zones, hypervisor_type, image_data_store_id)
-    VALUES (111, UUID(), 'simulator-Centos', 'CentOS 5.3(64-bit) no GUI (Simulator)', 1,
now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/templates/builtin/f59f18fb-ae94-4f97-afd2-f84755767aca.vhd.bz2',
'', 0, 'CentOS 5.3(64-bit) no GUI (Simulator)', 'VHD', 12, 1, 1, 'Simulator', 1);
+INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm,
bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured,
cross_zones, hypervisor_type)
+    VALUES (100, UUID(), 'simulator-domR', 'SystemVM Template (simulator)', 0, now(), 'SYSTEM',
0, 64, 1, 'http://nfs1.lab.vmops.com/templates/routing/debian/latest/systemvm.vhd.bz2', '',
0, 'SystemVM Template (simulator)', 'VHD', 15, 0, 1, 'Simulator');
+INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm,
bits, account_id, url, checksum, enable_password, display_text,  format, guest_os_id, featured,
cross_zones, hypervisor_type)
+    VALUES (111, UUID(), 'simulator-Centos', 'CentOS 5.3(64-bit) no GUI (Simulator)', 1,
now(), 'BUILTIN', 0, 64, 1, 'http://nfs1.lab.vmops.com/templates/centos53-x86_64/latest/f59f18fb-ae94-4f97-afd2-f84755767aca.vhd.bz2',
'', 0, 'CentOS 5.3(64-bit) no GUI (Simulator)', 'VHD', 11, 1, 1, 'Simulator');


Mime
View raw message