26568 Commits

Author SHA1 Message Date
Gaurav Aradhye
02c7bc0201 CLOUDSTACK-8336: Adding test for shared network restart, with and without cleanup
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-03-20 17:32:14 +05:30
Rohit Yadav
694b723899 CLOUDSTACK-8312: Fix NPE regression, copy template can have NULL volume size
The copy command reply can have null size returned, so check and set values

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 53ca0b1861c743caf61ec04f776c87eac334f185)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-20 17:27:14 +05:30
Gaurav Aradhye
62a733e8cf CLOUDSTACK-8330: Tagging test cases which should be run with vmware dvs configuration
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-03-20 17:20:55 +05:30
SrikanteswaraRao Talluri
5cea73d413 Revert "Merge branch '8330' of https://github.com/gauravaradhye/cloudstack"
This reverts commit f4498c48e30b473b2388c012b2e745bcbf9261c4, reversing
changes made to 7a2e27c3b3b3a3fef887f2bdcaa47a4980d904e4.
2015-03-20 17:14:07 +05:30
SrikanteswaraRao Talluri
f4498c48e3 Merge branch '8330' of https://github.com/gauravaradhye/cloudstack
This closes #121
2015-03-20 16:14:25 +05:30
Rohit Yadav
7a2e27c3b3 appliance: save md5 checksums after building systemvm templates
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-20 15:16:57 +05:30
Gaurav Aradhye
104ea2b5ef CLOUDSTACK-8330: Tagging test cases which should be run with vmware dvs configuration 2015-03-20 10:28:39 +05:30
Pierre-Luc Dion
304116623b removing previously added java.security.ciphers for add distro 2015-03-19 15:36:45 -04:00
Pierre-Luc Dion
dc8ab6057f fix centos7 rpm build, file misplaced 2015-03-19 10:16:20 -04:00
Pierre-Luc Dion
8d4f5b914e fix build for rpm packages due to missing file java.security.ciphers 2015-03-19 09:28:36 -04:00
Rohit Yadav
d7b4a1d843 packaging: install java.security.ciphers in rpms
This fixes rpm build failure

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-19 14:49:59 +05:30
Rohit Yadav
eddcb101dc CLOUDSTACK-8331: have savepassword try all interfaces
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b8192114767040ef4869a7e71886df5965dadb37)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-18 14:40:23 +05:30
Rohit Yadav
b011c9bad4 Add missing license headers from recent branch merge 3c429ee
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-18 11:03:54 +05:30
Rohit Yadav
f0da19a060 vpc_passwd_server: use the improved Python based password server
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 3262b0bfd99528fd74a1693185544948f4d951ef)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-18 10:43:20 +05:30
Rohit Yadav
3c429ee6b5 Merge remote-tracking branch 'sbp/feature/persisten-systemvm-redundant-vpc-REBASE'
This closes #118

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-17 15:44:57 +05:30
Rohit Yadav
83736ab534 CLOUDSTACK-8331: savepassword should try all IPs on eth0
The logic is same as passwd_server_ip script which runs password server on all
IPs on eth0 interface.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 294503a0251a1305c61a83bf4a094c1af8030a4c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-17 14:23:07 +05:30
Rohit Yadav
e3c04c7147 savepassword: use eth0's IP address, as password server listens on that IP
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 488625b1937eeb38f9a29706b6e7333043ae3e6e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-17 13:24:06 +05:30
Rajani Karuturi
e4fe7b3bbc Fixed build failure due to commit 843f6b16914159ea6241c6c1a0a04e9d0fefaed4
(cherry picked from commit 31cdb57e6b5de031d3a3f27c61fe55cf7dfb2d26)
2015-03-17 10:34:00 +05:30
Wei Zhou
b6eace03e4 UI: Fix typo in ui/scripts/configuration.js
(cherry picked from commit 5a860fe0aed62245f51e48fb70ef277d067955a0)
2015-03-16 12:58:50 +01:00
Ian Southam
23c100d949 If master gets called and then within a few seconds backup (this can happen during provisioning), the master process will complete after the backup one. Not what we want. These commands must be serial
Used a wee Unix socket to create a lock

We still need to find out why the flip flop occasionally happens. nopreempt should stop this ...
2015-03-16 11:40:12 +01:00
Ian Southam
7bfccd699b Fixed Port forwarding (DNAT/SNAT) for isolated networks
Fixed failure on using eth10 (which CS now supports)
Refactored CSForward to us CsInterface object instead of teh way it was kludged together
Fixed hex conversion for device numbers and iptables marks
2015-03-16 11:40:12 +01:00
Ian Southam
6fc680be71 Fixed password server respawning issue
Some changes to isolated network acl generation
2015-03-16 11:40:11 +01:00
Ian Southam
5ddf87b2fd Use reload on keepalived
restart causes the master status to flip unecessarily during provisioning tasks
2015-03-16 11:40:11 +01:00
Ian Southam
c38f0b91e3 Disable this for now - causes too much grief
Is also the root cause of the status UNKNOWN
2015-03-16 11:40:10 +01:00
Ian Southam
585f5f7000 ACL issues
ACL order issues
Do not block multicast traffic for vrrp
Many smaller bug fixes
checkrouter provided in /opt/cloud/bin
2015-03-16 11:40:10 +01:00
wilderrodrigues
8edeca179b Remove the priority checks from the code
- We do not use it anymore
2015-03-16 11:40:09 +01:00
Ian Southam
3cc0915a01 Work arounds for how CS adds and removes hosts 2015-03-16 11:40:08 +01:00
Ian Southam
748e2e51a9 Check both ip and hosts when building dhcp bag 2015-03-16 11:40:08 +01:00
Ian Southam
c1ec5b0b16 nat rules added to incorrect interface 2015-03-16 11:40:07 +01:00
Ian Southam
7700e940ff dnsmasq should restart if config changes and hup if hosts change 2015-03-16 11:40:07 +01:00
wilderrodrigues
962a62ed5f During the merge I removed by mistake the @Inject tag 2015-03-16 11:40:07 +01:00
wilderrodrigues
20d9715816 One of the routers is not running, so we don't have to continue here since the host will be null any way. Also, there is no need
To check either for sanity of duplicate master. Thus, just update the state and get lost.
2015-03-16 11:40:07 +01:00
wilderrodrigues
e7969b640b No hardcoded passwords.
- If for some reason the cmdLine json doesn't contain the password key, which is almost impossible to happen,
    we generate a password based on other unique data per VPC
2015-03-16 11:40:06 +01:00
wilderrodrigues
4b6604318d generate random password for redundant VPC 2015-03-16 11:40:06 +01:00
Ian Southam
baa758accc Utterley stupid 2015-03-16 11:40:06 +01:00
Ian Southam
639126da8b {ip: hosts} syntax goes wrong if ip contains 1::
Needs to anchore regexp
2015-03-16 11:40:05 +01:00
Ian Southam
aa6fdf853b A tab got in there somehow! 2015-03-16 11:40:05 +01:00
wilderrodrigues
ae6b07af15 Fix state of isolated redundant network router
- once stopped, got to UNKNOWN
2015-03-16 11:40:04 +01:00
Ian Southam
b3da2c54c2 Add network stats for isalated networks 2015-03-16 11:40:04 +01:00
wilderrodrigues
aa585e3428 Removing trailing spaces 2015-03-16 11:40:04 +01:00
wilderrodrigues
3af2ce3f50 Fix checkSanity. We do not need to check the priority anymore.
- It's taken care by VRRP.

wip: clean up where priority is still used.
2015-03-16 11:40:03 +01:00
Ian Southam
57d3ffaef8 Fixed password server, fixed more firewall issues
Fixed issues with real IP and not virtual (gateway) IP being opened on the firewall
DNS now works on the vms
2015-03-16 11:40:03 +01:00
wilderrodrigues
e6b3ee318c Fix the checkrouter.sh script in order to report the routers state 2015-03-16 11:40:02 +01:00
wilderrodrigues
0a133c06f8 Adding nre method to NetworkDao
- listVpcNetworks() to be used for the router check task
2015-03-16 11:40:01 +01:00
wilderrodrigues
6194b2c93e Move the . to the right place. 2015-03-16 11:40:00 +01:00
wilderrodrigues
dfa37b3159 Better message about making the VPC redundant
Remove the labels in other languages: Hugo told me there is a team responsible for that
2015-03-16 11:40:00 +01:00
wilderrodrigues
ca9deb70f6 Fix the router id on the virtural routers
- Using the VPC id, it is reliable.
   - Tested stopping/destroying/creating a router and VRRP is pretty happy
2015-03-16 11:39:59 +01:00
wilderrodrigues
05e4fe17e2 Show all routers of a VPC
- For redundant VPCs, we should see 2 routers
   - For single VPCs, we should see 1 router.
2015-03-16 11:39:59 +01:00
Ian Southam
9e82281cc1 Fixed rules for dhcp towards v,
Fixed fw rules for a bunch of things
Bring public interface up if no tier has been defined
2015-03-16 11:39:58 +01:00
wilderrodrigues
4c9f4fcdd3 Make virtual router id unique per redundant group
Customise the messages showed during VPC restart based on redundancy
Do not show "Make Redundant" option if VPC is already redundant
Show on VPC details if a VPC is redundant
2015-03-16 11:39:58 +01:00