8a7feb8ec1
Merge branch '2.2.y'
...
Conflicts:
agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
api/src/com/cloud/agent/api/to/FirewallRuleTO.java
api/src/com/cloud/agent/api/to/IpAddressTO.java
api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/api/ResponseGenerator.java
api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java
api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java
api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
api/src/com/cloud/api/commands/UpdateNetworkCmd.java
api/src/com/cloud/api/response/CapabilitiesResponse.java
api/src/com/cloud/network/Network.java
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/network/firewall/FirewallService.java
api/src/com/cloud/network/lb/LoadBalancingRule.java
api/src/com/cloud/network/lb/LoadBalancingRulesService.java
api/src/com/cloud/network/rules/FirewallRule.java
api/src/com/cloud/network/rules/RulesService.java
api/src/com/cloud/offering/NetworkOffering.java
client/tomcatconf/commands.properties.in
cloud.spec
core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
core/src/com/cloud/storage/template/DownloadManagerImpl.java
core/src/com/cloud/vm/DomainRouterVO.java
debian/cloud-deps.install
patches/systemvm/debian/config/etc/init.d/cloud-early-config
patches/systemvm/debian/config/root/ipassoc.sh
patches/systemvm/debian/config/root/loadbalancer.sh
scripts/vm/hypervisor/kvm/rundomrpre.sh
scripts/vm/hypervisor/xenserver/vmops
server/src/com/cloud/agent/manager/AgentAttache.java
server/src/com/cloud/agent/manager/AgentManagerImpl.java
server/src/com/cloud/agent/manager/AgentMonitor.java
server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
server/src/com/cloud/alert/ClusterAlertAdapter.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/cluster/ClusterManagerImpl.java
server/src/com/cloud/configuration/Config.java
server/src/com/cloud/configuration/ConfigurationManager.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/deploy/FirstFitPlanner.java
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
server/src/com/cloud/host/dao/HostDaoImpl.java
server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
server/src/com/cloud/network/LoadBalancerVO.java
server/src/com/cloud/network/NetworkManager.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/FirewallRulesDao.java
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/element/DhcpElement.java
server/src/com/cloud/network/element/VirtualRouterElement.java
server/src/com/cloud/network/firewall/FirewallManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/rules/FirewallManager.java
server/src/com/cloud/network/rules/FirewallRuleVO.java
server/src/com/cloud/network/rules/PortForwardingRuleVO.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/network/rules/StaticNatRuleImpl.java
server/src/com/cloud/network/security/SecurityGroupListener.java
server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
server/src/com/cloud/offerings/NetworkOfferingVO.java
server/src/com/cloud/server/ConfigurationServerImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/storage/StorageManager.java
server/src/com/cloud/storage/StorageManagerImpl.java
server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
server/src/com/cloud/storage/download/DownloadMonitorImpl.java
server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
server/src/com/cloud/upgrade/dao/Upgrade228to229.java
server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
server/src/com/cloud/user/AccountManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
server/src/com/cloud/vm/dao/DomainRouterDao.java
server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
setup/db/create-index-fk.sql
setup/db/create-schema.sql
setup/db/db/schema-222to224.sql
setup/db/db/schema-227to228.sql
setup/db/db/schema-228to229.sql
setup/db/db/schema-229to2210.sql
tools/testClient/README
ui/scripts/cloud.core.instance.js
utils/src/com/cloud/utils/SerialVersionUID.java
utils/src/com/cloud/utils/db/ConnectionConcierge.java
utils/src/com/cloud/utils/db/Merovingian2.java
utils/src/com/cloud/utils/db/Transaction.java
utils/src/com/cloud/utils/nio/Link.java
utils/src/com/cloud/utils/nio/NioConnection.java
utils/src/com/cloud/utils/time/InaccurateClock.java
2011-08-22 20:28:30 -07:00
7ccc833114
Fix potential redundant router FAULT state by dnsmasq
...
This message may show during redundant router start up:
FAULT (Restarting DNS forwarder and DHCP server: dnsmasq failed!)
This caused by edithost.sh is racy with keepalived process. They both want to
restart dnsmasq.
Even in normal condition, it's very hard to reproduce this bug. Add file lock
for edithost.sh should solve it.
2011-08-19 16:11:48 -07:00
d9b0188d7e
Fix potential redundant router FAULT state by dnsmasq
...
This message may show during redundant router start up:
FAULT (Restarting DNS forwarder and DHCP server: dnsmasq failed!)
This caused by edithost.sh is racy with keepalived process. They both want to
restart dnsmasq.
Even in normal condition, it's very hard to reproduce this bug. Add file lock
for edithost.sh should solve it.
2011-08-19 16:11:33 -07:00
b9183c0840
bug 10561: merging code from 2.2.10 to master
2011-08-16 14:20:51 +05:30
779989ce6b
bug 11103: create firewall chains on ipassoc
...
status 11103: resolved fixed
bug 11106: this is somehow fixed / cannot reproduced
status 11106: resolved fixed
2011-08-15 10:18:44 -07:00
51f4485143
bug 11084: ensure AH and ESP protocols are allowed in when creating a VPN
2011-08-15 10:18:09 -07:00
407b45ee2e
Fix ping in cloud-early-config
...
The old ping don't have -w option
2011-08-12 13:47:13 -07:00
11dfba635c
Fix ping in cloud-early-config
...
The old ping don't have -w option
2011-08-12 13:47:01 -07:00
2aa349f769
bug 11083: Fix broadcast address is 0.0.0.0
...
The reason is:
1. In redundant router, we won't enable eth2(public network interface) until
keepalived determine the router is MASTER.
2. ipassoc.sh normally kick in before keepalived process running. And it would
set eth2's IP address using "ip addr add $dev $ip"
3. "ip addr add $dev $ip" won't add mask for the device, then there is no way to
update broadcast address for eth2. Then broadcast address is 0.0.0.0.
4. As long as "ip addr add $dev $ip" executed, later executed "ifconfig $dev $ip
netmask $mask" won't calculated the broadcast address from $ip and $mask.
To fix this, we enable and configure eth2 temporaily when cloud-early-config
executed, then disable eth2 interface. By this way, broadcast address of should
be calculated and set correctly.
status 11083: resolved fixed
2011-08-12 00:11:52 -07:00
ccdd7ce17f
bug 11083: Fix broadcast address is 0.0.0.0
...
The reason is:
1. In redundant router, we won't enable eth2(public network interface) until
keepalived determine the router is MASTER.
2. ipassoc.sh normally kick in before keepalived process running. And it would
set eth2's IP address using "ip addr add $dev $ip"
3. "ip addr add $dev $ip" won't add mask for the device, then there is no way to
update broadcast address for eth2. Then broadcast address is 0.0.0.0.
4. As long as "ip addr add $dev $ip" executed, later executed "ifconfig $dev $ip
netmask $mask" won't calculated the broadcast address from $ip and $mask.
To fix this, we enable and configure eth2 temporaily when cloud-early-config
executed, then disable eth2 interface. By this way, broadcast address of should
be calculated and set correctly.
status 11083: resolved fixed
2011-08-12 00:11:39 -07:00
29cc88571f
Redundant router script fix, also fix CheckRouterTask
2011-08-11 17:57:12 -07:00
23e6b96c98
Redundant router script fix, also fix CheckRouterTask
2011-08-11 17:57:00 -07:00
258a1bc451
Ifdown may not bring interface down if ifup not run
...
Use ifconfig to bring it down
2011-08-11 15:01:02 -07:00
a935e52b62
Ifdown may not bring interface down if ifup not run
...
Use ifconfig to bring it down
2011-08-11 15:00:43 -07:00
f91d173511
bug 10561: handle icmp (finally\!)
2011-08-11 14:36:41 -07:00
7807e29c30
Use ifup/ifdown for redundant router
2011-08-11 14:30:21 -07:00
95cc2d6381
Use ifup/ifdown for redundant router
2011-08-11 14:29:49 -07:00
88a1c69413
bug 10561: get static nat working
2011-08-11 12:41:21 -07:00
d1ec7e759b
remove cruft
2011-08-11 11:26:45 -07:00
4e4a44f2c4
Fix sometime system VM is up but mgmt server can't reach it
2011-08-11 11:01:14 -07:00
8b405e477c
Fix sometime system VM is up but mgmt server can't reach it
2011-08-11 10:57:05 -07:00
7c2395e684
bug 10561: fix: last entry in the firewall rules unable to delete
2011-08-11 19:01:36 +05:30
699b197a3c
bug 10561: changes to the create/delete firewall rule backend script:
...
1) changes to the return value
2) added a FIXME to one the leak.
2011-08-11 16:53:18 +05:30
35e67bbfdf
bug 10561: ensure outgoing connections work
2011-08-10 23:16:04 -07:00
16803387c6
bug 10812: changes to dhcp option 15 and 119
2011-08-11 10:23:20 +05:30
d29b01ca7f
bug 10561: backend rules for firewall
2011-08-10 18:39:52 -07:00
9f6dc993ab
Fix dhcp_entry.sh fail on redundant router
...
And don't worry about "chkconfig dnsmasq off", because keepalived script should
take care of it.
2011-08-10 17:13:45 -07:00
02049d4cd4
Fix dhcp_entry.sh fail on redundant router
...
And don't worry about "chkconfig dnsmasq off", because keepalived script should
take care of it.
2011-08-10 17:13:15 -07:00
34682b3bb0
Fix ping commandline parameter
2011-08-10 12:07:43 -07:00
ab4c4de989
Fix redundant router start up
...
commit e4fe14a9ce19fbbdb15bbfaad586d80031ca9fbc break redundant router, because
at time of ping, the network is not up for redundant router.
Add timout for ping
2011-08-10 12:07:37 -07:00
5cf6feb2e5
Fix "RTNETLINK answers: No such process" when starting redundant router
...
The issue happened quite rare, but indeed can show.
And when the issue happen, the status of redundant router would be "Status:
FAULT".
It's due to ipassoc.sh wasn't executed before the system bring eth2 up and go to
master mode, then eth2 wasn't configured correctly. Then "ip route add default
xx" can't complete.
This commit should fixes the issue.
2011-08-10 12:06:53 -07:00
a9eb14c42e
bug 10561: backend added for CreateFirewallRule and deleteFirewallRule
2011-08-10 17:06:42 +05:30
f409a9535f
bug 10812: adding the domain serach order to option 15, now the dhcp client is able to set this for search entry
2011-08-10 15:52:47 +05:30
738a9b3ad0
Fix "RTNETLINK answers: No such process" when starting redundant router
...
The issue happened quite rare, but indeed can show.
And when the issue happen, the status of redundant router would be "Status:
FAULT".
It's due to ipassoc.sh wasn't executed before the system bring eth2 up and go to
master mode, then eth2 wasn't configured correctly. Then "ip route add default
xx" can't complete.
This commit should fixes the issue.
2011-08-09 22:25:06 -07:00
9a0a3f195c
Fix ping commandline parameter
2011-08-09 21:41:56 -07:00
ba2ec7e770
Fix redundant router start up
...
commit e4fe14a9ce19fbbdb15bbfaad586d80031ca9fbc break redundant router, because
at time of ping, the network is not up for redundant router.
Add timout for ping
2011-08-09 21:02:01 -07:00
56d5054e39
Revert "bug 10561: Allowing ICMP traffic through static NAT"
...
This reverts commit 5e74e24bb359456967866cb2c6cc0f6f73570f97.
Conflicts:
server/src/com/cloud/network/rules/RulesManagerImpl.java
2011-08-09 15:51:57 -07:00
adfb6a1f03
bug 11017: kick VMware vSwitch by pinging the default gateway to work around mysterous VMware network problem
2011-08-09 15:47:22 -07:00
69ca341f1b
bug 11017: kick VMware vSwitch by pinging the default gateway to work around mysterous VMware network problem
2011-08-09 15:45:11 -07:00
071a67dcb8
Change router to FAULT state if anything goes wrong on fail-over
2011-08-09 11:09:44 -07:00
980c4b9120
Change router to FAULT state if anything goes wrong on fail-over
2011-08-09 11:09:20 -07:00
536db8a1de
loadbalancer.sh changes : 1) Removed source cidrs from iptable script,2) added sudo before iptables
2011-08-09 18:34:16 +05:30
ad29587e43
bug 10800,10557 :
...
Cahnges:
1) putting back the changes(bug 10800 and 10557) that had been reverted during merging of Elb/nectarine.
2) 10800 Upgrade from previous release also added: Upgrade from Previous release will leave iptable rules in the INPUT ipchain, this is fixed.
2011-08-09 16:53:19 +05:30
179368ea32
get lb working on advanced mode again
2011-08-09 01:02:58 -07:00
e62f828e52
bug 11003: Fix HAproxy with new template
...
New debian package didn't create directory /var/lib/haproxy, which result in
haproxy fail to work.
status 11003: resolved fixed
2011-08-08 17:59:25 -07:00
12cadca538
Revert "bug 10561: Allowing ICMP traffic through static NAT"
...
This reverts commit 5e74e24bb359456967866cb2c6cc0f6f73570f97.
2011-08-08 17:59:05 -07:00
8277584b8a
merge ELB / nectarine branch
2011-08-08 15:20:56 -07:00
55eb0e4b65
bug 11003: Fix HAproxy with new template
...
New debian package didn't create directory /var/lib/haproxy, which result in
haproxy fail to work.
status 11003: resolved fixed
2011-08-08 13:36:53 -07:00
9985df928b
Try to workaround "ip route add" fail in redundant router
...
It's probably due to the network is not ready, so wait some time for it.
2011-08-05 16:40:57 -07:00
49709d716a
Try to workaround "ip route add" fail in redundant router
...
It's probably due to the network is not ready, so wait some time for it.
2011-08-05 16:40:35 -07:00
alena
Sheng Yang
Naredula Janardhana Reddy
Chiradeep Vittal
Abhinandan Prateek
Kelven Yang