cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From devd...@apache.org
Subject git commit: updated refs/heads/4.3 to 9f5bea6
Date Fri, 27 Dec 2013 07:37:20 GMT
Updated Branches:
  refs/heads/4.3 8c2c37f8b -> 9f5bea620


CLOUDSTACK-5655: hyper-v configuration parameters are missing in upgraded setup. Updated
the db upgrade schema script to insert the configuration parameters.


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

Branch: refs/heads/4.3
Commit: 9f5bea6204ac9fee348ea891aeb449e503b6b231
Parents: 8c2c37f
Author: Devdeep Singh <devdeep@gmail.com>
Authored: Fri Dec 27 13:04:59 2013 +0530
Committer: Devdeep Singh <devdeep@gmail.com>
Committed: Fri Dec 27 13:07:52 2013 +0530

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9f5bea62/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index 9cc3649..d2713c0 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -282,7 +282,7 @@ public enum Config {
     // Hyperv
     HypervPublicNetwork("Hidden", ManagementServer.class, String.class, "hyperv.public.network.device",
null, "Specify the public virtual switch on host for public network", null),
     HypervPrivateNetwork("Hidden", ManagementServer.class, String.class, "hyperv.private.network.device",
null, "Specify the virtual switch on host for private network", null),
-    HypervGuestNetwork("Hidden", ManagementServer.class, String.class, "hyperv.guest.network.device",
null, "Specify the virtual switch on host for private network", null),
+    HypervGuestNetwork("Hidden", ManagementServer.class, String.class, "hyperv.guest.network.device",
null, "Specify the virtual switch on host for guest network", null),
 
 	// Usage
 	UsageExecutionTimezone("Usage", ManagementServer.class, String.class, "usage.execution.timezone",
null, "The timezone to use for usage job execution time", null),

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9f5bea62/setup/db/db/schema-421to430.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-421to430.sql b/setup/db/db/schema-421to430.sql
index 76c2399..95a8e8c 100644
--- a/setup/db/db/schema-421to430.sql
+++ b/setup/db/db/schema-421to430.sql
@@ -851,6 +851,10 @@ INSERT IGNORE INTO `cloud`.`vm_template` (id, uuid, unique_name, name,
public, c
 
 UPDATE `cloud`.`configuration` SET `component` = 'VMSnapshotManager' WHERE `name` IN ("vmsnapshot.create.wait",
"vmsnapshot.max");
 
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Hidden', 'DEFAULT', 'management-server',
'hyperv.guest.network.device', null, 'Specify the virtual switch on host for guest network',
NULL, NULL, NULL, 0);
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Hidden', 'DEFAULT', 'management-server',
'hyperv.private.network.device', null, 'Specify the virtual switch on host for private network',
NULL, NULL, NULL, 0);
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Hidden', 'DEFAULT', 'management-server',
'hyperv.public.network.device', null, 'Specify the public virtual switch on host for public
network', NULL, NULL, NULL, 0);
+
 ALTER TABLE `cloud`.`external_load_balancer_devices` ADD COLUMN `is_exclusive_gslb_provider`
int(1) unsigned NOT NULL DEFAULT 0 COMMENT '1 if load balancer appliance is acting exclusively
as gslb service provider in the zone and can not be used for LB';
 
 CREATE TABLE `cloud`.`s2s_customer_gateway_details` (


Mime
View raw message