etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug 8391: remove guest.ip.network global config param 

removing unused global config parameters  guest.ip.network and guest.netmask
status 8391: resolved fixed
This commit is contained in:
Murali Reddy 2011-05-03 13:14:00 +05:30
parent 2f9efc6424
commit 8a90f3665f
3 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/configuration/Config.java
View File

@ -56,8 +56,6 @@ public enum Config {
// Network
GuestIpNetwork("Network", AgentManager.class, String.class, "guest.ip.network", "10.1.1.1", "The network address of the guest virtual network. Virtual machines will be assigned an IP in this subnet.", "privateip"),
GuestNetmask("Network", AgentManager.class, String.class, "guest.netmask", "255.255.255.0", "The netmask of the guest virtual network.", "netmask"),
GuestVlanBits("Network", ManagementServer.class, Integer.class, "guest.vlan.bits", "12", "The number of bits to reserve for the VLAN identifier in the guest subnet.", null),
//MulticastThrottlingRate("Network", ManagementServer.class, Integer.class, "multicast.throttling.rate", "10", "Default multicast rate in megabits per second allowed.", null),
NetworkThrottlingRate("Network", ManagementServer.class, Integer.class, "network.throttling.rate", "200", "Default data transfer rate in megabits per second allowed in network.", null),

5
setup/db/db/schema-224to225.sql
View File

@ -35,6 +35,9 @@ ALTER TABLE `cloud`.`secondary_storage_vm` ADD COLUMN `role` varchar(64) NOT NUL
INSERT INTO `cloud`.`configuration` (category, instance, component, name, value, description) VALUES ('Network', 'DEFAULT', 'management-server', 'vm.network.throttling.rate', 200, 'Default data transfer rate in megabits per second allowed in user vm\'s default network.');
DELETE FROM `cloud`.`configuration` where name='guest.ip.network';
DELETE FROM `cloud`.`configuration` where name='guest.netmask';
ALTER TABLE `cloud`.`host_pod_ref` ADD COLUMN `removed` datetime COMMENT 'date removed if not null';
ALTER TABLE `cloud`.`host_pod_ref` MODIFY `name` varchar(255);
@ -50,4 +53,4 @@ ALTER TABLE `cloud`.`vm_template` ADD COLUMN `source_template_id` bigint unsigne
ALTER TABLE `cloud`.`op_dc_link_local_ip_address_alloc` ADD INDEX `i_op_dc_link_local_ip_address_alloc__pod_id`(`pod_id`);
ALTER TABLE `cloud`.`op_dc_link_local_ip_address_alloc` ADD INDEX `i_op_dc_link_local_ip_address_alloc__data_center_id`(`data_center_id`);
ALTER TABLE `cloud`.`op_dc_link_local_ip_address_alloc` ADD INDEX `i_op_dc_link_local_ip_address_alloc__nic_id_reservation_id`(`nic_id`,`reservation_id`);
ALTER TABLE `cloud`.`op_dc_link_local_ip_address_alloc` ADD INDEX `i_op_dc_link_local_ip_address_alloc__nic_id_reservation_id`(`nic_id`,`reservation_id`);

16
setup/db/server-setup.xml
View File

@ -168,22 +168,6 @@
-->
<configurationEntries>
<!--
The guest.ip.network and guest.netmask parameters control the guest virtual network.
The guest virtual network is an overlay network on top of the management network and
is managed by VMOps multitenant hypervisor. By default, as you can see from the
netmask, the guest network is limited to 254 guests, so you may want to change the
netmask if you plan to run larger-than-254-guest clusters of VMs in a single guest
network.
-->
<configuration>
<name>guest.ip.network</name>
<value>10.1.1.1</value>
</configuration>
<configuration>
<name>guest.netmask</name>
<value>255.255.255.0</value>
</configuration>
<!--
The default.zone parameter controls in which zone machines are created by default,
if you do not specify a zone.