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

bug 11513: Fix public IP release in advance network 

We should only persist DomR's public ip, not console proxy and ssvm.

Reviewed-by: Edison
This commit is contained in:
Sheng Yang 2011-09-21 18:33:50 -07:00
parent ad0c82cae7
commit 902458bfa0
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/network/guru/PublicNetworkGuru.java
View File

@ -156,8 +156,10 @@ public class PublicNetworkGuru extends AdapterBase implements NetworkGuru {
if (nic.getIp4Address() == null) {
nic.setStrategy(ReservationStrategy.Start);
} else {
} else if (vm.getVirtualMachine().getType() == VirtualMachine.Type.DomainRouter){
nic.setStrategy(ReservationStrategy.Managed);
} else {
nic.setStrategy(ReservationStrategy.Create);
}
return nic;

4
setup/db/db/schema-2211to2212.sql
View File

@ -29,7 +29,9 @@ ALTER TABLE `cloud`.`resource_count` ADD UNIQUE `i_resource_count__type_domaintI
UPDATE configuration set description='Load Balancer(haproxy) stats visibilty, the value can be one of the following six parameters : global,guest-network,link-local,disabled,all,default' WHERE name='network.loadbalancer.haproxy.stats.visibility' ;
UPDATE nics SET strategy="Managed" WHERE (ip4_address, network_id) IN (SELECT public_ip_address, source_network_id FROM user_ip_address WHERE source_nat=1);
UPDATE nics SET strategy="Managed" WHERE (ip4_address, network_id) IN (SELECT public_ip_address, source_network_id FROM user_ip_address WHERE source_nat=1) AND vm_type="DomainRouter";
UPDATE nics SET strategy="Created" WHERE strategy="Managed" AND vm_type!="DomainRouter";
CREATE TABLE IF NOT EXISTS `cloud`.`inline_load_balancer_nic_map` (
`id` bigint unsigned NOT NULL auto_increment,