Hi Team,
Please find attached the ASF master git patch for Bug CS-15181
(http://bugs.cloudstack.org/browse/CS-15181 ). Also, pasting the contents of
the patch below for quicker review.
Regards,
Vijay
>From 890d5b14283c354eeba47d652f20478ce4e8030d Mon Sep 17 00:00:00 2001
From: Vijayendra Bhamidipati <vijayendra.bhamidip...@citrix.com>
Date: Mon, 18 Jun 2012 17:38:46 -0700
Subject: [PATCH] CS-15181: Remove stale global config parameters from upgrade
script
Description:
Removing stale global config params.
---
setup/db/db/schema-302to303.sql | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/setup/db/db/schema-302to303.sql b/setup/db/db/schema-302to303.sql
index 32f68e6..d22d88d 100755
--- a/setup/db/db/schema-302to303.sql
+++ b/setup/db/db/schema-302to303.sql
@@ -121,9 +121,6 @@ DELETE FROM `cloud`.`configuration` WHERE
name='xen.min.xapi.version';
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT',
'management-server', 'enable.ec2.api', 'false', 'enable EC2 API on
CloudStack');^M
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT',
'management-server', 'enable.s3.api', 'false', 'enable Amazon S3 API on
CloudStack');^M
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT',
'management-server', 'vmware.use.nexus.vswitch', 'false', 'Enable/Disable Cisco
Nexus 1000v vSwitch in VMware environment');^M
-INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT',
'management-server', 'vmware.guest.network.vswitch.type', 'standard', 'Specify
type of (standard/nexus) virtual switch designated for guest traffic');^M
-INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT',
'management-server', 'vmware.private.network.vswitch.type','standard', 'Specify
type of (standard/nexus) virtual switch designated for private traffic');^M
-INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT',
'management-server', 'vmware.public.network.vswitch.type', 'standard', 'Specify
type of (standard/nexus) virtual switch designated for public traffic');^M
ALTER TABLE `cloud`.`account` ADD COLUMN `default_zone_id` bigint unsigned;^M
ALTER TABLE `cloud`.`account` ADD CONSTRAINT `fk_account__default_zone_id`
FOREIGN KEY `fk_account__default_zone_id`(`default_zone_id`) REFERENCES
`data_center`(`id`) ON DELETE CASCADE;^M
^M
--
1.7.5.1
