You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/11/30 11:21:15 UTC
[1/5] git commit: updated refs/heads/4.5 to d623352
Repository: cloudstack
Updated Branches:
refs/heads/4.5 3f2e259e1 -> d62335215
CLOUDSTACK-9078: Gave scripts executable permissions.
(cherry picked from commit e2fc270480916901b2bfd4f4bab376a6008f9f57)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Conflicts:
python/lib/cloudutils/serviceConfigServer.py
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e1ef2e9a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e1ef2e9a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e1ef2e9a
Branch: refs/heads/4.5
Commit: e1ef2e9ac08193ef515e7817de2936850125035b
Parents: 3f2e259
Author: Boris Schrijver <bo...@pcextreme.nl>
Authored: Mon Nov 23 00:07:29 2015 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Nov 30 15:35:56 2015 +0530
----------------------------------------------------------------------
python/lib/cloudutils/serviceConfigServer.py | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e1ef2e9a/python/lib/cloudutils/serviceConfigServer.py
----------------------------------------------------------------------
diff --git a/python/lib/cloudutils/serviceConfigServer.py b/python/lib/cloudutils/serviceConfigServer.py
index b928df4..7d4240e 100644
--- a/python/lib/cloudutils/serviceConfigServer.py
+++ b/python/lib/cloudutils/serviceConfigServer.py
@@ -108,6 +108,8 @@ class cloudManagementConfig(serviceCfgBase):
#distro like sl 6.1 needs this folder, or tomcat6 failed to start
checkHostName()
bash("mkdir /var/log/cloudstack-management/")
+ bash("chown cloud:cloud -R /var/lib/cloudstack/")
+ bash("chmod +x -R /usr/share/cloudstack-management/webapps/client/WEB-INF/classes/scripts/")
#set max process per account is unlimited
if os.path.exists("/etc/security/limits.conf"):
cfo = configFileOps("/etc/security/limits.conf")
[4/5] git commit: updated refs/heads/4.5 to d623352
Posted by bh...@apache.org.
CLOUDSTACK-9045: Corrected mount point for management server DEBIAN.
(cherry picked from commit 7bbc5338c50820107dc5a7c4b6c1fbf09e1afd40)
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/865dd46b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/865dd46b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/865dd46b
Branch: refs/heads/4.5
Commit: 865dd46bbed6d4f8dd8731a8efb15ede93cb3425
Parents: 75f7c4d
Author: Boris Schrijver <bo...@pcextreme.nl>
Authored: Sun Nov 8 20:38:08 2015 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Nov 30 15:43:49 2015 +0530
----------------------------------------------------------------------
packaging/debian/replace.properties | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/865dd46b/packaging/debian/replace.properties
----------------------------------------------------------------------
diff --git a/packaging/debian/replace.properties b/packaging/debian/replace.properties
index 5a0bd58..124c016 100644
--- a/packaging/debian/replace.properties
+++ b/packaging/debian/replace.properties
@@ -21,7 +21,6 @@ DBROOTPW=
MSLOG=vmops.log
APISERVERLOG=api.log
DBHOST=localhost
-MSMNTDIR=/mnt
COMPONENTS-SPEC=components-premium.xml
AWSAPILOG=awsapi.log
REMOTEHOST=localhost
@@ -45,7 +44,7 @@ MSCONF=/etc/cloudstack/management
MSENVIRON=/usr/share/cloudstack-management
MSLOG=/var/log/cloudstack/management/management-server.log
MSLOGDIR=/var/log/cloudstack/management/
-MSMNTDIR=/var/lib/cloud/mnt
+MSMNTDIR=/var/lib/cloudstack/mnt
MSUSER=cloud
PIDDIR=/var/run
PLUGINJAVADIR=
[5/5] git commit: updated refs/heads/4.5 to d623352
Posted by bh...@apache.org.
CLOUDSTACK-9039: Fix paths for logging Ubuntu Management.
(cherry picked from commit acd49d801be0cf5675ce2b2130277b85fad213bd)
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/d6233521
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d6233521
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d6233521
Branch: refs/heads/4.5
Commit: d62335215b2b95cf29599186b97f08efd162c3a8
Parents: 865dd46
Author: Boris Schrijver <bo...@pcextreme.nl>
Authored: Thu Nov 5 16:30:14 2015 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Nov 30 15:45:38 2015 +0530
----------------------------------------------------------------------
python/lib/cloudutils/serviceConfig.py | 2 +-
python/lib/cloudutils/serviceConfigServer.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d6233521/python/lib/cloudutils/serviceConfig.py
----------------------------------------------------------------------
diff --git a/python/lib/cloudutils/serviceConfig.py b/python/lib/cloudutils/serviceConfig.py
index 292c9a7..8847e63 100755
--- a/python/lib/cloudutils/serviceConfig.py
+++ b/python/lib/cloudutils/serviceConfig.py
@@ -54,7 +54,7 @@ class serviceCfgBase(object):
except:
logging.debug(formatExceptionInfo())
if self.syscfg.env.mode == "Server":
- raise CloudRuntimeException("Configure %s failed, Please check the /var/log/cloudstack/setupManagement.log for detail"%self.serviceName)
+ raise CloudRuntimeException("Configure %s failed, Please check the /var/log/cloudstack/management/setupManagement.log for detail"%self.serviceName)
else:
raise CloudRuntimeException("Configure %s failed, Please check the /var/log/cloudstack/agent/setup.log for detail"%self.serviceName)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d6233521/python/lib/cloudutils/serviceConfigServer.py
----------------------------------------------------------------------
diff --git a/python/lib/cloudutils/serviceConfigServer.py b/python/lib/cloudutils/serviceConfigServer.py
index 7d4240e..b9062e2 100644
--- a/python/lib/cloudutils/serviceConfigServer.py
+++ b/python/lib/cloudutils/serviceConfigServer.py
@@ -126,4 +126,4 @@ class cloudManagementConfig(serviceCfgBase):
if self.syscfg.svo.enableService("cloudstack-management"):
return True
else:
- raise CloudRuntimeException("Failed to configure %s, please see the /var/log/cloudstack/setupManagement.log for detail"%self.serviceName)
+ raise CloudRuntimeException("Failed to configure %s, please see the /var/log/cloudstack/management/setupManagement.log for detail"%self.serviceName)
[2/5] git commit: updated refs/heads/4.5 to d623352
Posted by bh...@apache.org.
CLOUDSTACK-9058
Respond with "saved_password" if no password is to be issued.
(cherry picked from commit 8a7deefe64cab0b3c49ebc510c6524b1fad1f884)
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/296a5d77
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/296a5d77
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/296a5d77
Branch: refs/heads/4.5
Commit: 296a5d77528d11ec43fd239698f7314dc977408d
Parents: e1ef2e9
Author: dsclose <ds...@users.noreply.github.com>
Authored: Thu Nov 12 08:05:57 2015 +0000
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Nov 30 15:37:42 2015 +0530
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/passwd_server_ip.py | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/296a5d77/systemvm/patches/debian/config/opt/cloud/bin/passwd_server_ip.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/passwd_server_ip.py b/systemvm/patches/debian/config/opt/cloud/bin/passwd_server_ip.py
index 91dec24..fc84910 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/passwd_server_ip.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/passwd_server_ip.py
@@ -113,6 +113,7 @@ class PasswordRequestHandler(BaseHTTPRequestHandler):
if requestType == 'send_my_password':
password = getPassword(clientAddress)
if not password:
+ self.wfile.write('saved_password')
syslog.syslog('serve_password: requested password not found for %s' % clientAddress)
else:
self.wfile.write(password)
[3/5] git commit: updated refs/heads/4.5 to d623352
Posted by bh...@apache.org.
CLOUDSTACK-9053 security upgrade as per COLLECTIONS-580
Picked from Daan's fix from: https://github.com/apache/cloudstack/pull/1089
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/75f7c4d0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/75f7c4d0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/75f7c4d0
Branch: refs/heads/4.5
Commit: 75f7c4d085a7387f0121ebb4834cb983ec1f056d
Parents: 296a5d7
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Mon Nov 30 15:39:24 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Nov 30 15:39:24 2015 +0530
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/75f7c4d0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 94b4be9..3090888 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
<cs.pool.version>1.6</cs.pool.version>
<cs.codec.version>1.6</cs.codec.version>
<cs.configuration.version>1.8</cs.configuration.version>
- <cs.collections.version>3.2.1</cs.collections.version>
+ <cs.collections.version>3.2.2</cs.collections.version>
<cs.logging.version>1.1.1</cs.logging.version>
<cs.discovery.version>0.5</cs.discovery.version>
<cs.ejb.version>3.0</cs.ejb.version>