From 65fc2ec345e65d18581dd566c1bf605dc004795c Mon Sep 17 00:00:00 2001
From: Kishan Kavala <kishan@cloud.com>
Date: Fri, 2 Aug 2013 11:58:48 +0530
Subject: [PATCH] CLOUDSTACK-4032: Added KVM.snapshot.enabled config to 41to42
 upgrade

Conflicts:
	setup/db/db/schema-410to420.sql
---
 server/src/com/cloud/configuration/Config.java | 4 +++-
 setup/db/db/schema-410to420.sql                | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index c2b13463d07..1d1624b5627 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -572,7 +572,9 @@ public enum Config {
             return "TemplateManager";
         } else if (_componentClass == VpcManager.class) {
             return "VpcManager";
-        }else {
+        } else if (_componentClass == SnapshotManager.class) {
+            return "SnapshotManager";
+        } else {
             return "none";
         }
     }
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index 99a02086e27..6aa1222ec33 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -2220,3 +2220,5 @@ CREATE TABLE `cloud_usage`.`usage_vmsnapshot` (
 ) ENGINE=InnoDB CHARSET=utf8;
 
 ALTER TABLE volumes ADD COLUMN vm_snapshot_chain_size bigint(20) unsigned;
+
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Snapshots', 'DEFAULT', 'SnapshotManager', 'KVM.snapshot.enabled', 'false', 'whether snapshot is enabled for KVM hosts');