You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2013/08/01 18:58:52 UTC
git commit: updated refs/heads/4.2 to 620eb50
Updated Branches:
refs/heads/4.2 ba059dd0a -> 620eb5094
CLOUDSTACK-4015: don't insert the fake template record when upgrade from 304 to 305
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/620eb509
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/620eb509
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/620eb509
Branch: refs/heads/4.2
Commit: 620eb509418bbd8c3c21932be0e89567eb0d705b
Parents: ba059dd
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Thu Aug 1 09:56:43 2013 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Thu Aug 1 09:58:12 2013 -0700
----------------------------------------------------------------------
.../com/cloud/upgrade/dao/Upgrade304to305.java | 7 +------
setup/db/db/vmwaretmplinsert-304to305.sql | 22 --------------------
2 files changed, 1 insertion(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/620eb509/engine/schema/src/com/cloud/upgrade/dao/Upgrade304to305.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade304to305.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade304to305.java
index f9b7e5e..dc4668f 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade304to305.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade304to305.java
@@ -56,13 +56,8 @@ public class Upgrade304to305 extends Upgrade30xBase implements DbUpgrade {
if (script == null) {
throw new CloudRuntimeException("Unable to find db/schema-304to305.sql");
}
-
- String vmWareTemplateInsertScript = Script.findScript("", "db/vmwaretmplinsert-304to305.sql");
- if (vmWareTemplateInsertScript == null) {
- throw new CloudRuntimeException("Unable to find db/vmwaretmplinsert-304to305.sql");
- }
- return new File[] { new File(vmWareTemplateInsertScript), new File(script) };
+ return new File[] { new File(script) };
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/620eb509/setup/db/db/vmwaretmplinsert-304to305.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/vmwaretmplinsert-304to305.sql b/setup/db/db/vmwaretmplinsert-304to305.sql
deleted file mode 100755
index 469d937..0000000
--- a/setup/db/db/vmwaretmplinsert-304to305.sql
+++ /dev/null
@@ -1,22 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliances
--- with the License. You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
-
-#This file doesn't exist on 3.0.x branch. The fake template record is being inserted just because this template will never be used in 4.2 version of the code
-INSERT IGNORE INTO `cloud`.`vm_template` (unique_name, name, public, featured, type, hvm, bits, url, format, created, account_id, checksum, display_text, enable_password,
- enable_sshkey, guest_os_id, bootable, prepopulate, cross_zones, extractable, hypervisor_type, source_template_id, template_tag, sort_key)
-VALUES ("systemvm-vmware-3.0.5", "systemvm-vmware-3.0.5", 1, 1, "USER", 0, 64, "fake url", "fake format", now(), 1, null, "fake text", 0,
- 0, 99, 1, 0, 1, 0, "VMware", NULL, NULL, 0);