CLOUDSTACK-9077 Fix injectkeys.sh to work on CentOS7Fix regression from commit 3381154fafb7fa4f0a61d538f7c2550e48247787
The error seen on CentOS 7:
```
2015-11-20 21:51:16,161 DEBUG [c.c.s.ConfigurationServerImpl] (localhost-startStop-1:null) No loop device found, skipping ssh key insertion in systemvm.iso
```
Instead of detecting `/dev/loop0` this checks if we run inside Docker.
Tested on CentOS 7 and that now works again as expected.
```
2015-11-23 16:20:16,777 DEBUG [c.c.s.ConfigurationServerImpl] (localhost-startStop-1:null) Executing: /bin/bash /var/lib/tomcat/webapps/client/WEB-INF/classes/scripts/vm/systemvm/injectkeys.sh /home/cloud/.ssh/id_rsa.pub /home/cl
oud/.ssh/id_rsa /var/lib/tomcat/webapps/client/WEB-INF/classes/vms/systemvm.iso
2015-11-23 16:20:16,821 DEBUG [c.c.s.ConfigurationServerImpl] (localhost-startStop-1:null) Execution is successful.
2015-11-23 16:20:16,827 INFO [c.c.s.ConfigurationServerImpl] (localhost-startStop-1:null) Injected public and private keys into systemvm iso with result : null
```
Pinging @pdion891 to have a look.
* pr/1109:
CLOUDSTACK-9077 Fix injectkeys.sh to work on CentOS7
Signed-off-by: Remi Bergsma <github@remi.nl>
Shuffling the password to avoid having a subset of characters in fixed positions.Related to CLOUDSTACK-9052.
I am shuffling the characters in the password, to avoid having a certain char type in fixed positions. I modified the tests accordingly to only check that the different character types are present.
I think it would be good to remove the hard requirement to have at least one of digits, upper-case, and lowercase chars, as it reduces the number of possible combinations passwords can take. What do you think?
* pr/1058:
CLOUDSTACK-9052 Shuffling the password to avoid having a subset of characters in fixed positions.
Signed-off-by: Remi Bergsma <github@remi.nl>
CLOUDSTACK-9055: fix NPE in updating Redundant State of VPC networksThis issue happened when the KVM nodes is down.It might also happen when the cloudstack-agent is killed unexpectedly.
* pr/1073:
CLOUDSTACK-9055: fix NPE in updating Redundant State of VPC networks
Signed-off-by: Remi Bergsma <github@remi.nl>
CLOUDSTACK-9053 security upgrade as per COLLECTIONS-580 cloustack is not vulnerable but as the classes are in they might
be used in the future so we upgrade to prevent accidental
vulnerabilities.
unit tests in master succeeded. unit tests on 4.6 passed. integration tests going on.
* pr/1089:
CLOUDSTACK-9053 security upgrade as per COLLECTIONS-580
Signed-off-by: Remi Bergsma <github@remi.nl>
CLOUDSTACK-9057 remove old system vm upgrade codereplacing #1061 on release branch for 4.6
* pr/1072:
CLOUDSTACK-9057 remove old system vm upgrade code
Signed-off-by: Remi Bergsma <github@remi.nl>
[4.6.1] CLOUDSTACK-9015 - Redundant VPC Virtual Router's state is BACKUP & BACKUP or MASTER & MASTERThis PR closes#1064
All the details can be found in the original PR, which won't be merged because it was created agains master. Once this PR is closed, the original one will be also closed.
* pr/1070:
CLOUDSTACK-9015 - Delete public IP in order to get both IP and NAT rule removed.
CLOUDSTACK-9015 - Add test to cover the rVPC routers stop/start/reboot scenario
CLOUDSTACK-9015 - Make sure the Backup router can talk to the Master router after a stop/start/reboot
Signed-off-by: Remi Bergsma <github@remi.nl>
CLOUDSTACK-9058 - Respond with "saved_password" if no password is to be issued.The password server on the virtual router should respond with "saved_password" if no password is to be issued. This allows for backwards compatibility with Windows Guest VMs which require the "saved_password" response.
* pr/1079:
CLOUDSTACK-9058
Signed-off-by: Remi Bergsma <github@remi.nl>
implement upgrade path from 4.6.0 to 4.6.1The 4.6 branch needs an upgrade path to 4.6.1. I looked at how this was done before and think this will do. Can you give it a second pair of eyes please @DaanHoogland ?
When this is indeed OK, I'll do the same for master for the 4.6.0 -> 4.7.0 path.
I've tried a build and that works: `mvn clean install`
```
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 07:33 min
[INFO] Finished at: 2015-11-15T13:45:58+01:00
[INFO] Final Memory: 120M/1591M
[INFO] ------------------------------------------------------------------------
```
Once this is a PR, I'll try an actual upgrade from 4.6.0 to 4.6.1-SNAPSHOT.
* pr/1067:
implemented upgrade path from 4.6.0 to 4.6.1
Signed-off-by: Remi Bergsma <github@remi.nl>
- Stop KeepaliveD/ConntrackD if the eth2 (guest) interface is not configured and UP
- Only setup the redundancy after all the router configuration is done
- Open the FW for the VRRP communitation
- 224.0.0.18 and 225.0.0.50
- Set keepalived.conf.templ by default to use interface eth2 (guest)
- It will be reconfigured anyway, but having eth2 there is more clear
CLOUDSTACK-9023 filtering privatekey info from loggingtested off-line but rebased afterwards!
* pr/1055:
CLOUDSTACK-9023 filtering privatekey info from logging
Signed-off-by: Remi Bergsma <github@remi.nl>
Fix the new line bug (invalid char on UI), add some Spanish translation from Transifex
Some strings with invalid encoding has been fixed too (Thanks Nicolas Vazquez)
Related to CLOUDSTACK-9043
* pr/1053:
Fix the new line bug (invalid char on UI), add some Spanish translation from Transifex
Signed-off-by: Remi Bergsma <github@remi.nl>
CLOUDSTACK-9049: fix Centos7 with Tomcat7 packaging and python libsCLOUDSTACK-9049: Fix Centos7 with Tomcat7 packaging and python libs
* pr/1052:
CLOUDSTACK-9049: fix Centos7 with Tomcat7 packaging and python libs * adjust library to support tomcat7 config files * adjust centos7 spec to use tomcat7 config files from deployment * add option to use tomcat7 files in management server setup
reorder content to match original
Signed-off-by: Remi Bergsma <github@remi.nl>
Fix some small UI bugs[UI] fix typo for user data field
[UI] Private Cloud VPC always shows 0 in Site-to-Site VPN, even when one is configured
[UI] change the Icon for changing ACL's for a tier in a VPC
[UI] Network names are not being displayed in Infra VRs router NICS
* pr/1034:
[UI] change alert to ui dialog in response of instance wizard
[UI] Network names are not being displayed in Infra » VRs » router » NICS
[UI] change the Icon for changing ACL's for a tier in a VPC
[UI] Private Cloud VPC always shows 0 in Site-to-Site VPN, even when one is configured
[UI] fix typo for user data field
Signed-off-by: Remi Bergsma <github@remi.nl>
* adjust library to support tomcat7 config files
* adjust centos7 spec to use tomcat7 config files from deployment
* add option to use tomcat7 files in management server setup
CLOUDSTACK-9044: Add RBD Primary Storage to the Zone Wizard.Added to option to use RBD as primary storage in the Zone Wizard.
Pure UI change.
* pr/1046:
CLOUDSTACK-9044: Add RBD Primary Storage to the Zone Wizard.
Signed-off-by: Remi Bergsma <github@remi.nl>
squashed commit for dockerfiles part#2 including comments from PR#910This PR replace PR#910 which include fix from comments in PR#910.
This PR simplify download of systemvm templates, work with docker-compose and enable integration-api port and use of localstorage without reconfiguration of cloudstack.
Rebased on Oct28.
* pr/999:
squashed commit for dockerfiles part#2 including comments from PR#910
Signed-off-by: Remi Bergsma <github@remi.nl>
CLOUDSTACK-9046 - Fix upgrade path from 4.4 and 4.5 to 4.6This PR fixes the upgrade path from 4.4.x/4.5.x to 4.6.0. We introduced the logic to update the database with the correct information about the SystemVMs.
We tested this PR with by doing an upgrade from 4.4.4 to 4.6.0 and it works as expected.
* pr/1050:
CLOUDSTACK-9046 - Add new ACS systemVMs website
CLOUDSTACK-9046 - Add SystemVM upgrade from 4.5 to 4.6 in the Upgrade452to460.java file
Signed-off-by: Remi Bergsma <github@remi.nl>
CLOUDSTACK-9039: Fix paths for logging Ubuntu ManagementFix paths for logging Ubuntu Management.
How to test:
Install via DEB packages...
* pr/1039:
CLOUDSTACK-9039: Fix paths for logging Ubuntu Management.
Signed-off-by: Remi Bergsma <github@remi.nl>
CLOUDSTACK-9029: Proper support to identify CentOS 7 version numberhttps://issues.apache.org/jira/browse/CLOUDSTACK-9029
* pr/1033:
CLOUDSTACK-9029: Proper support to identify CentOS 7 version number
Signed-off-by: Remi Bergsma <github@remi.nl>
CLOUDSTACK-9045: Corrected mount point for management server DEBIAN.Corrected mount point for management server DEBIAN.
See issue: https://issues.apache.org/jira/browse/CLOUDSTACK-9045
* pr/1047:
CLOUDSTACK-9045: Corrected mount point for management server DEBIAN.
Signed-off-by: Remi Bergsma <github@remi.nl>
CLOUDSTACK-9043 Remove \n (new line) in German and Chinese translationThe new line isn't in the original strings and are invalid character in the javascript files/ui
Tested with success on Chrome
* pr/1043:
Remove \n (new line) in German and Chinese translation
Signed-off-by: Remi Bergsma <github@remi.nl>
CLOUDSTACK-9038 - Infrastructure tab is slow because of synchronous API callsMaking parallel asynchronous calls to speed up the infrastructure page.
* pr/1036:
CLOUDSTACK-9038 - Infrastructure tab is slow because of synchronous API calls
Signed-off-by: Remi Bergsma <github@remi.nl>
