Commit Graph

303 Commits

Author SHA1 Message Date
anthony 99e46e4c2f VPC : add vpc_ipassoc.sh vpc_snat.sh
Conflicts:

	wscript
2012-06-18 10:35:32 -07:00
Alena Prokharchyk aaf0d24a83 Merge branch 'vpc-3.0.x' into 3.0.x
Conflicts:
	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/AssociateIPAddrCmd.java
	api/src/com/cloud/api/commands/EnableStaticNatCmd.java
	api/src/com/cloud/event/EventTypes.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/rules/RulesService.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
	scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vm/MockVirtualMachineManagerImpl.java
	setup/db/create-schema.sql
	wscript
2012-06-14 19:04:59 -07:00
anthony 8f4ccf9f72 VPC : revert dnsmasq.conf 2012-06-13 15:48:58 -07:00
anthony d3720c988b VPC : add vpc_vpn_l2tp.sh 2012-06-12 17:09:50 -07:00
anthony 91363d555e VPC : fix nic hot plug script 2012-06-12 12:26:31 -07:00
anthony 7e463932f0 VPC : add nic hot plug script 2012-06-12 11:56:12 -07:00
anthony 372582ca6b VPC : vpc_ipassosc.sh 2012-06-11 19:07:36 -07:00
anthony 389833dfe7 VPC : add new dnsmasq.conf for VPC domr 2012-06-11 18:08:37 -07:00
anthony c854cb04e5 VPC : add new type vpcrouter in cloud-early-config 2012-06-11 18:00:06 -07:00
anthony 28335a0ffb VPC : revert iptables-router 2012-06-11 17:44:26 -07:00
anthony 196be6f5fa VPC : revert change in cloud-early-config 2012-06-11 17:41:26 -07:00
anthony 99385d7c38 VPC : add new ipassoc.sh for vpc 2012-06-11 17:37:37 -07:00
anthony 00278191bb VPC : revert changes in ipassoc.sh 2012-06-11 17:35:37 -07:00
anthony 8712199cfd VPC : bug fix 2012-06-11 17:15:16 -07:00
anthony 52d93071c8 VPC : bug fix 2012-06-07 19:10:20 -07:00
anthony a159255e36 VPC : many debug fix 2012-06-07 17:53:12 -07:00
anthony 1b81342354 VPC : use routerProxy to call networkUsage.sh 2012-06-06 16:36:47 -07:00
anthony 1fa6ba5ecc VPC : move acl.sh ipassoc.sh to /opt/cloud/bin/ 2012-06-06 14:22:06 -07:00
anthony 5700510c26 VPC, implement plug/unplug nic 2012-06-05 15:38:25 -07:00
anthony e682f10fc8 typo fix 2012-06-04 18:00:14 -07:00
anthony 0be4382bf1 add guestnw.sh
add acl.sh
merge setup_dhcpsvr and setup_route
2012-06-04 16:35:27 -07:00
anthony 0d89f34a48 1. move control network to eth0 on domr
2. if it is basic mode, use guest NIC as Control NIC
2012-06-04 16:35:27 -07:00
Sheng Yang 2caed96c3a CS-15175: Fix public interfaces of redundant router
We need to use ifup/ifdown to bring up the interfaces, because ifconfig don't
know the ip of the interface after we modify cloud-early-config to avoid
first start up of public interface.

Reviewed-by: Edison
2012-06-04 16:29:12 -07:00
Sheng Yang 32812e3fcd CS-14421: Clean /etc/network/interfaces when sysytemvm reboot
In order to make sure next time, booting process would use cloud-early-config's
setup, rather than networking scripts to bring up interfaces.

Reviewed-by: Kelven Yang
2012-06-04 16:29:07 -07:00
anthony b650fef1e0 CS-14784, CS-15065 , after release IP, reapply other IPs in the same eth device, to prevent secondary IPs are removed when primary IP is removed 2012-05-23 18:45:49 -07:00
Jayapal 173a894a8b CS-13500 Added hairpin NAT fix for static NAT 2012-05-23 12:03:55 +05:30
anthony 2c1dc421c2 CS-14784 support multiple subnets
resolved fixed
2012-05-16 16:41:45 -07:00
Naredula Janardhana Reddy e75520259d Bug 14120: Enabling SNAT for all the public NICs.
Summary of changes:
    - snat flag is set to true if it is first ip of the NIC.

reviewed-by: Abhi
2012-05-07 09:59:44 +05:30
JohnZ ef2c7423f1 S3 API merged branch 2012-05-02 15:51:10 +01:00
Sheng Yang e34fcff9b9 Don't bring up eth2 for booting process of redundant router 2012-05-01 16:21:02 -07:00
Sheng Yang 90774621f1 Fix keepalived process not started issue 2012-05-01 16:20:48 -07:00
Sheng Yang b0d9e5cbb9 bug 12706: Add broadcast address for the network interface
status 12706: resolved fixed
2012-05-01 13:15:49 +01:00
Naredula Janardhana Reddy 7087116fcb Bug 13964:
Summary of changes: Added Hairpin Nat.
  - defined Harpin NAT function.
  - Called Hairpin NAT while adding/deleting port forwading and Static NAT rules.
  - added rules in IPtables config file, this will be iniated during bootup to forward New/established connectons from eth0 to eth0.
2012-05-01 13:12:47 +01:00
Sheng Yang ae0c3e0d26 CS-14421: Fix default interfaces file
I can't see why we set eth0 to dhcp by default. It would result in eth0 want to
get a DHCP address from outside. We should always assign ip through
cloud-early-config for it.

But one point is, the priority of cloud-early-config and networking script is
the same.  So even networking got some ip from outside, cloud-early-config
should able to override it(if cloud-early-config runs after networking) or
networking script won't get dhcp (if cloud-early-config runs before networking),
so I am not quite understand why router would get DHCP address in fact. Maybe
there are other issues.
2012-04-27 14:35:41 -07:00
frank 72d284de7d Switch to Apache license 2012-04-03 04:54:14 -07:00
Sheng Yang 3c293bc4b3 bug 14558: Add log for passwd_server
In case something goes wrong.

Log located at /var/log/cloud.log
2012-03-30 14:19:59 -07:00
Sheng Yang ce2e1166e0 bug 14042: Don't set dhcp:router option on DHCP server for non-default network on CentOS/RHEL
The routing table with two nics may be messed up, due to we sent same
router(gateway) information from different DHCP server, in order to specify
default gateway. E.g.

Network A: 192.168.1.0/24, gw 192.168.1.1
Network B: 192.168.2.0/24, gw 192.168.2.1

User VM: Nic 1 connect to network A, get ip 192.168.1.10; nic 2 connect to
network B, get ip 192.168.2.10.

Set network A as the default network of user VM.

Currently we would send this information to user VM through DHCP offer:
In network A: dhcp-option:router 192.168.1.1
In network B: dhcp-option:router 192.168.1.1

So both NIC in the guest VM would receive 192.168.1.1 as router(gateway).

But, in CentOS 5.6, dhclient-scripts try to tell if the gateway is reachable
for current subnet.

So when we try to enable nic 2(eth1) of user VM, dhclient would receive:
IP: 192.168.2.10
Mask: 255.255.255.0
Router: 192.168.1.1

Then it would found that the specified gateway(router) is not within its own
subnet(192.168.2.0/24). But since we send out this ip(192.168.1.1) as the
gateway for it, dhclient thought that it should got someway to access the
network through this IP. So it would execute:

ip route add 192.168.1.1 dev eth1
ip route replace default via 192.168.1.1 dev eth1

But it can never reach 192.168.1.1(which is in the eth0's subnet and the
gateway of eth0) by go through eth1 interface. So it is messed up.

We've tested Windows 2008 R2, CentOS 5.3, CentOS 5.6 and Ubuntu 10.04. Windows
and Ubuntu are fine with above policy.

To solve this, we send different dhcp:router option according to the guest OS
type now.

We may need expand this list later, but for now we only know that CentOS and
RHEL would behavior in this way.

status 14042: resolved fixed
2012-03-21 10:37:30 -07:00
frank 3579c47173 Bug 14347 - Security: Extra files on Secondary Storage VM's Apache root
status 14347: resolved fixed
2012-03-16 17:04:42 -07:00
Sheng Yang e8c27c1978 bug 14215: Fix SSVM on Xen kernel panic due to "too many env var"
Just add different delimitor for VM and extract them from cmdline later.

status 14215: resolved fixed
2012-03-16 14:45:30 -07:00
Naredula Janardhana Reddy 5e6082d647 Bug 13375:
Summary of changes:
  - Fix the order of source nat ip's : Static Nat IP's will be on top of Router source nat IP's. means Static NAT ip will take higher preference when compare to router ip while picking ip for source nat.

Reviewed-by: Abhi
2012-02-20 16:30:49 +05:30
Sheng Yang 6486993b27 bug 13821: Shutdown interface with ip 0.0.0.0
status 13821: resolved fixed

Reviewed-by: Frank
2012-02-16 14:42:07 -08:00
Naredula Janardhana Reddy 25165b0879 Bug 12808: ignoring errors on delete.
Reviewed-by: Abhi
2012-02-16 14:45:35 +05:30
Naredula Janardhana Reddy b8222508ac Bug 12808:
Summary of Changes:   Using multiple routing tables to send the packets on the public NIC's based on source IP for the following type of connections:
  - Inbound connections of Static NAT ip .
  - Outbound connections of static-NAT (using static NAT-ip for SNAT).
Reviewed-by: Abhi
2012-02-16 14:43:48 +05:30
Sheng Yang 9fc1991d5b bug 13606: Fix releasing of the first IP of second public nic
The problem is remove_first_ip() in ipassoc.sh can't be called more than one.
The call after the first time would result in iptable and ip command failure,
thus result in failure of execution of IpAssocCommand.

Use the same way to detect already disassociated ip address of non-first
IP(remove_an_ip()) to fix the issue.

reviewed-by: Edison Su

status 13606: resolved fixed
2012-02-13 11:55:16 -08:00
Sheng Yang c6eb393f5c bug 13403: Don't use backported kernel for system vm
Revert "bug 11056: Add backported kernel and discard customized kernel module"

This reverts commit 857e817cfc707f4280f295a91642ded861c5aa68.

Bug 13403 is due to new kernel fail to suppose hot-unplug of xen vnif.

Notice the module is only backported for kernel 2.6.32-5-686-bigmem. That's why
I hardcode the kernel version here.

status 13403: resolved fixed
2012-02-06 17:17:01 -08:00
frank 890bfffe2f Bug 6849 - Randomize systemvm passwords (edit)
status 6849: resolved fixed
2012-02-03 17:28:58 -08:00
Naredula Janardhana Reddy 72fb7256d7 Bug 13297,13375,12705 :
Summary of changes :
        - Added a new flag -s to ipassoc command to carry if the ip address is
used for SNAT or not.
        - SNAT is completly decoupled from the first flag. first flag is used
to decide if the ip address is first ip address of the interface.
        - -s and -f are independent, SNAT can be enabled on the non-first ip
also.
2012-02-01 12:39:10 +05:30
Chiradeep Vittal f498ca6389 bug 13160: blacklist aesni_intel module to avoid crash 2012-01-27 16:27:19 -08:00
Naredula Janardhana Reddy b889fdab38 Bug 12808: Merge issues: alter the sequence, due to the failure of CHECKSUM ip rule, the other rule(CONNMARK) getting not executed.
Fix : altered the sequence.
2012-01-25 15:01:42 +05:30
Naredula Janardhana Reddy e52ac3ae31 Bug 12808: Logging added, Improved remove_routing 2012-01-25 12:54:36 +05:30