apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.11'

Browse Source
This commit is contained in:
Daan Hoogland 2018-04-13 11:44:30 +02:00
commit cf3c2d1aab
7 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PULL_REQUEST_TEMPLATE.md
View File

@ -12,6 +12,13 @@
- [ ] Enhancement (improves an existing feature and functionality)
- [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
## GitHub Issue/PRs
<!-- If this PR is to fix an issue or another PR on GH, uncomment the section and provide the id of issue/PR -->
<!-- When "Fixes: #<id>" is specified, the issue/PR will automatically be closed when this PR gets merged -->
<!-- For addressing multiple issues/PRs, use multiple "Fixes: #<id>" -->
<!-- Fixes: # -->
## Screenshots (if appropriate):
## How Has This Been Tested?

2
api/src/main/java/com/cloud/agent/api/storage/OVFHelper.java
View File

@ -113,7 +113,7 @@ public class OVFHelper {
String allocationUnits = disk.getAttribute("ovf:capacityAllocationUnits");
od._diskId = disk.getAttribute("ovf:diskId");
od._fileRef = disk.getAttribute("ovf:fileRef");
od._populatedSize = Long.parseLong(disk.getAttribute("ovf:populatedSize") == null ? "0" : disk.getAttribute("ovf:populatedSize"));
od._populatedSize = NumberUtils.toLong(disk.getAttribute("ovf:populatedSize"));
if ((od._capacity != 0) && (allocationUnits != null)) {

2
python/lib/cloud_utils.py
View File

@ -759,7 +759,7 @@ class SetupLiveMigration(ConfigTask):
if os.path.exists("/etc/init/libvirt-bin.conf"):
replace_line("/etc/init/libvirt-bin.conf", "exec /usr/sbin/libvirtd","exec /usr/sbin/libvirtd -d -l")
else:
replace_or_add_line("/etc/default/libvirt-bin","libvirtd_opts=","libvirtd_opts='-l -d'")
replace_or_add_line("/etc/default/libvirt-bin","libvirtd_opts=","libvirtd_opts='-l'")
else:
raise AssertionError("Unsupported distribution")

7
python/lib/cloudutils/serviceConfig.py
View File

@ -526,9 +526,12 @@ class libvirtConfigUbuntu(serviceCfgBase):
if os.path.exists("/etc/init/libvirt-bin.conf"):
cfo = configFileOps("/etc/init/libvirt-bin.conf", self)
cfo.replace_line("exec /usr/sbin/libvirtd","exec /usr/sbin/libvirtd -d -l")
else:
elif os.path.exists("/etc/default/libvirt-bin"):
cfo = configFileOps("/etc/default/libvirt-bin", self)
cfo.replace_or_add_line("libvirtd_opts=","libvirtd_opts='-l -d'")
cfo.replace_or_add_line("libvirtd_opts=","libvirtd_opts='-l'")
elif os.path.exists("/etc/default/libvirtd"):
cfo = configFileOps("/etc/default/libvirtd", self)
cfo.replace_or_add_line("libvirtd_opts=","libvirtd_opts='-l'")
def config(self):
try:

3
systemvm/debian/etc/apache2/conf-enabled/security.conf Normal file
View File

@ -0,0 +1,3 @@
ServerTokens Prod
ServerSignature Off
TraceEnable Off

3
systemvm/debian/opt/cloud/bin/setup/common.sh
View File

@ -496,9 +496,6 @@ clean_ipalias_config() {
setup_apache2_common() {
sed -i 's/^Include ports.conf.*/# CS: Done by Python CsApp config\n#Include ports.conf/g' /etc/apache2/apache2.conf
[ -f /etc/apache2/conf.d/security ] && sed -i -e "s/^ServerTokens .*/ServerTokens Prod/g" /etc/apache2/conf.d/security
[ -f /etc/apache2/conf.d/security ] && sed -i -e "s/^ServerSignature .*/ServerSignature Off/g" /etc/apache2/conf.d/security
# Disable listing of http://SSVM-IP/icons folder for security issue. see article http://www.i-lateral.com/tutorials/disabling-the-icons-folder-on-an-ubuntu-web-server/
[ -f /etc/apache2/mods-available/alias.conf ] && sed -i s/"Options Indexes MultiViews"/"Options -Indexes MultiViews"/ /etc/apache2/mods-available/alias.conf

6
ui/css/cloudstack3.css
View File

@ -4452,7 +4452,7 @@ textarea {
/**** Head*/
.dashboard.admin .dashboard-container.head {
width: 966px;
height: 331px;
height: 431px;
margin: 9px 0 0;
float: left;
}
@ -4512,7 +4512,7 @@ textarea {
/**** Charts / stats*/
.dashboard.admin .zone-stats {
width: 974px;
height: 316px;
height: 416px;
overflow: auto;
overflow-x: hidden;
/*+placement:shift 0px 0px;*/
@ -4711,7 +4711,7 @@ textarea {
.dashboard.admin .dashboard-container.sub.alerts {
float: left;
margin: 0 12px 0 0;
height: 270px;
height: 170px;
overflow: hidden;
position: relative;
}