etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge release branch 4.8 to master 

* 4.8:
  CLOUDSTACK-9172 Added cross zones check to delete template and iso
  Check the existence of 'forceencap' parameter before use
  systemvm: set default umask 022 in injectkeys.sh
This commit is contained in:
Will Stevens 2016-04-21 16:32:36 -04:00
parent 8ae4da89d2 c2fc0c4cd3
commit 37afba05f4
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packaging/centos63/cloud-management.rc
View File

@ -87,6 +87,7 @@ handle_pid_file() {
}
start() {
umask 0022
readpath=$(readlink -f $0)
source `dirname $readpath`/tomcat.sh
}

1
packaging/centos7/cloud-management.service
View File

@ -24,6 +24,7 @@ Description=CloudStack Management Server
After=syslog.target network.target
[Service]
UMask=0022
Type=simple
EnvironmentFile=/etc/tomcat/tomcat.conf
Environment="NAME=cloudstack-management"

2
scripts/vm/systemvm/injectkeys.sh
View File

@ -27,7 +27,7 @@ set -e
TMP=/tmp
MOUNTPATH=${HOME}/systemvm_mnt
TMPDIR=${TMP}/cloud/systemvm
umask 022
clean_up() {
$SUDO umount $MOUNTPATH

2
systemvm/patches/debian/config/opt/cloud/bin/configure.py
View File

@ -531,6 +531,8 @@ class CsSite2SiteVpn(CsDataBag):
file.addeq(" pfs=%s" % CsHelper.bool_to_yn(obj['dpd']))
file.addeq(" keyingtries=2")
file.addeq(" auto=start")
if 'encap' not in obj:
obj['encap']=False
file.addeq(" forceencaps=%s" % CsHelper.bool_to_yn(obj['encap']))
if obj['dpd']:
file.addeq(" dpddelay=30")

16
ui/scripts/templates.js
View File

@ -1451,8 +1451,12 @@
}
},
action: function(args) {
var queryParams = "deleteTemplate&id=" + args.context.templates[0].id;
if (!args.context.templates[0].crossZones){
queryParams += "&zoneid=" + args.context.zones[0].zoneid;
}
$.ajax({
url: createURL("deleteTemplate&id=" + args.context.templates[0].id + "&zoneid=" + args.context.zones[0].zoneid),
url: createURL(queryParams),
dataType: "json",
async: true,
success: function(json) {
@ -2536,12 +2540,12 @@
}
},
action: function(args) {
var array1 = [];
if (args.context.zones[0].zoneid != null)
array1.push("&zoneid=" + args.context.zones[0].zoneid);
var queryParams = "deleteIso&id=" + args.context.isos[0].id;
if (!args.context.isos[0].crossZones){
queryParams += "&zoneid=" + args.context.zones[0].zoneid;
}
$.ajax({
url: createURL("deleteIso&id=" + args.context.isos[0].id + "&zoneid=" + args.context.zones[0].zoneid),
url: createURL(queryParams),
dataType: "json",
async: true,
success: function(json) {