You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sw...@apache.org on 2016/04/21 22:32:17 UTC
[1/7] git commit: updated refs/heads/4.8 to c2fc0c4
Repository: cloudstack
Updated Branches:
refs/heads/4.8 59ac07e5a -> c2fc0c4cd
systemvm: set default umask 022 in injectkeys.sh
The default umask of 0022 is set in Ubuntu and other packages. Set the same
in case of CentOS startup scripts. Use umask 022 in the injectkeys.sh script
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a11f7110
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a11f7110
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a11f7110
Branch: refs/heads/4.8
Commit: a11f7110622d1161ad1e363d73a6a40d6fd9c2de
Parents: 9610056
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Fri Feb 19 13:50:37 2016 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Mar 14 12:21:57 2016 +0100
----------------------------------------------------------------------
packaging/centos63/cloud-management.rc | 1 +
packaging/centos7/cloud-management.service | 1 +
scripts/vm/systemvm/injectkeys.sh | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a11f7110/packaging/centos63/cloud-management.rc
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud-management.rc b/packaging/centos63/cloud-management.rc
index f5ed7a8..5b6ba4f 100755
--- a/packaging/centos63/cloud-management.rc
+++ b/packaging/centos63/cloud-management.rc
@@ -87,6 +87,7 @@ handle_pid_file() {
}
start() {
+ umask 0022
readpath=$(readlink -f $0)
source `dirname $readpath`/tomcat.sh
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a11f7110/packaging/centos7/cloud-management.service
----------------------------------------------------------------------
diff --git a/packaging/centos7/cloud-management.service b/packaging/centos7/cloud-management.service
index 19989ec..db52dcf 100644
--- a/packaging/centos7/cloud-management.service
+++ b/packaging/centos7/cloud-management.service
@@ -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"
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a11f7110/scripts/vm/systemvm/injectkeys.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/systemvm/injectkeys.sh b/scripts/vm/systemvm/injectkeys.sh
index 6f224cd..863ca6a 100755
--- a/scripts/vm/systemvm/injectkeys.sh
+++ b/scripts/vm/systemvm/injectkeys.sh
@@ -27,7 +27,7 @@ set -e
TMP=/tmp
MOUNTPATH=${HOME}/systemvm_mnt
TMPDIR=${TMP}/cloud/systemvm
-
+umask 022
clean_up() {
$SUDO umount $MOUNTPATH
[3/7] git commit: updated refs/heads/4.8 to c2fc0c4
Posted by sw...@apache.org.
CLOUDSTACK-9172 Added cross zones check to delete template and iso
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cfd2ce71
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cfd2ce71
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cfd2ce71
Branch: refs/heads/4.8
Commit: cfd2ce71edbab431412f48b14011c8a137df1d22
Parents: e3e5be8
Author: Patrick Dube <pd...@cloudops.com>
Authored: Wed Apr 20 16:16:32 2016 -0400
Committer: Patrick Dube <pd...@cloudops.com>
Committed: Wed Apr 20 16:16:32 2016 -0400
----------------------------------------------------------------------
ui/scripts/templates.js | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cfd2ce71/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index c8c5b89..fb01334 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -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) {
[4/7] git commit: updated refs/heads/4.8 to c2fc0c4
Posted by sw...@apache.org.
Merge pull request #1420 from shapeblue/injectsh-umaskfix
systemvm: preserve file permissions, set default umask- In injectkeys.sh which is used to inject new public keys everytime cloudstack
starts; while copying files preserve the mode/ownership. This ensures the
scripts have same mode bits as originally configured in the iso file
- The default umask of 0022 is set in Ubuntu and other packages. Set the same
in case of CentOS startup scripts
cc @abhinandanprateek @wido @remibergsma @DaanHoogland @jburwell
* pr/1420:
systemvm: set default umask 022 in injectkeys.sh
Signed-off-by: Will Stevens <wi...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f9846f17
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f9846f17
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f9846f17
Branch: refs/heads/4.8
Commit: f9846f1785721532482b731a580f1c21ef2114ed
Parents: 2ada75c a11f711
Author: Will Stevens <wi...@gmail.com>
Authored: Thu Apr 21 16:29:51 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Thu Apr 21 16:29:51 2016 -0400
----------------------------------------------------------------------
packaging/centos63/cloud-management.rc | 1 +
packaging/centos7/cloud-management.service | 1 +
scripts/vm/systemvm/injectkeys.sh | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/7] git commit: updated refs/heads/4.8 to c2fc0c4
Posted by sw...@apache.org.
Check the existence of 'forceencap' parameter before use
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/53de78f6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/53de78f6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/53de78f6
Branch: refs/heads/4.8
Commit: 53de78f64230cc688f32aa072bdb6359fb77714d
Parents: a243339
Author: Remi Bergsma <gi...@remi.nl>
Authored: Fri Feb 5 16:58:01 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Tue Apr 19 11:11:19 2016 +0200
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/configure.py | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/53de78f6/systemvm/patches/debian/config/opt/cloud/bin/configure.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/configure.py b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
index ab134fc..fd37f40 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/configure.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
@@ -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")
[5/7] git commit: updated refs/heads/4.8 to c2fc0c4
Posted by sw...@apache.org.
Merge pull request #1402 from remibergsma/forceencap_check
Check the existence of 'forceencap' parameter before useCheck the existence of 'forceencap' parameter before use.
Error seen:
```
Traceback (most recent call last):
File "/opt/cloud/bin/update_config.py", line 140, in <module>
process_file()
File "/opt/cloud/bin/update_config.py", line 54, in process_file
finish_config()
File "/opt/cloud/bin/update_config.py", line 44, in finish_config
returncode = configure.main(sys.argv)
File "/opt/cloud/bin/configure.py", line 1003, in main
vpns.process()
File "/opt/cloud/bin/configure.py", line 488, in process
self.configure_ipsec(self.dbag[vpn])
File "/opt/cloud/bin/configure.py", line 544, in configure_ipsec
file.addeq(" forceencaps=%s" % CsHelper.bool_to_yn(obj['encap']))
KeyError: 'encap'
```
* pr/1402:
Check the existence of 'forceencap' parameter before use
Signed-off-by: Will Stevens <wi...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a7fef86b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a7fef86b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a7fef86b
Branch: refs/heads/4.8
Commit: a7fef86bb35f136cc9605ab15043763775f4c6ca
Parents: f9846f1 53de78f
Author: Will Stevens <wi...@gmail.com>
Authored: Thu Apr 21 16:30:16 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Thu Apr 21 16:30:16 2016 -0400
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/configure.py | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a7fef86b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
----------------------------------------------------------------------
[7/7] git commit: updated refs/heads/4.8 to c2fc0c4
Posted by sw...@apache.org.
Merge release branch 4.7 to 4.8
* 4.7:
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
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c2fc0c4c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c2fc0c4c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c2fc0c4c
Branch: refs/heads/4.8
Commit: c2fc0c4cd3573ea6491ca9dd8b19d9c56c1a5ea0
Parents: 59ac07e d13ff88
Author: Will Stevens <wi...@gmail.com>
Authored: Thu Apr 21 16:31:49 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Thu Apr 21 16:31:49 2016 -0400
----------------------------------------------------------------------
packaging/centos63/cloud-management.rc | 1 +
packaging/centos7/cloud-management.service | 1 +
scripts/vm/systemvm/injectkeys.sh | 2 +-
.../debian/config/opt/cloud/bin/configure.py | 2 ++
ui/scripts/templates.js | 16 ++++++++++------
5 files changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[6/7] git commit: updated refs/heads/4.8 to c2fc0c4
Posted by sw...@apache.org.
Merge pull request #1505 from pdube/CLOUDSTACK-9172-delete-cross-zones-template
CLOUDSTACK-9172 Added cross zones check to delete template and isoAdded a check to ignore the zoneid, in the delete template UI, if the template is cross zones.
reference : CLOUDSTACK-9172
* pr/1505:
CLOUDSTACK-9172 Added cross zones check to delete template and iso
Signed-off-by: Will Stevens <wi...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d13ff88c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d13ff88c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d13ff88c
Branch: refs/heads/4.8
Commit: d13ff88cbcd9d4aca25ab2a244f0469f1a0949c0
Parents: a7fef86 cfd2ce7
Author: Will Stevens <wi...@gmail.com>
Authored: Thu Apr 21 16:30:50 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Thu Apr 21 16:30:50 2016 -0400
----------------------------------------------------------------------
ui/scripts/templates.js | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------