cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [1/3] git commit: updated refs/heads/master to 3a81a44
Date Wed, 24 Aug 2016 06:45:39 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 11c90dfb3 -> 3a81a4498


CLOUDSTACK-9452: add python-argparse dependency on el6,7 rpms

The patchviasocket script was rewritten in Python from PR #1533 and made
assumptions that Python 2.7 would be available. In case of CentOS, python 2.7
may not be available or installed. This change ensures that python-argparse
is installed which is used by this script.

Expose cmd error in the logs when patch command fails.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7b8ba24c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7b8ba24c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7b8ba24c

Branch: refs/heads/master
Commit: 7b8ba24c647c218265384c7f84cafb1dddb9219c
Parents: bdc409c
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Wed Aug 10 14:13:40 2016 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Wed Aug 10 16:25:17 2016 +0530

----------------------------------------------------------------------
 packaging/centos63/cloud.spec                                      | 1 +
 packaging/centos7/cloud.spec                                       | 1 +
 .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java    | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b8ba24c/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 583dced..6a3a8dd 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -96,6 +96,7 @@ management, and intelligence in CloudStack.
 %package common
 Summary: Apache CloudStack common files and scripts
 Requires: python
+Requires: python-argparse
 Obsoletes: cloud-test < 4.1.0 
 Obsoletes: cloud-scripts < 4.1.0
 Obsoletes: cloud-utils < 4.1.0

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b8ba24c/packaging/centos7/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index dc9eac7..975fecc 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -91,6 +91,7 @@ management, and intelligence in CloudStack.
 %package common
 Summary: Apache CloudStack common files and scripts
 Requires: python
+Requires: python-argparse
 Group:   System Environment/Libraries
 %description common
 The Apache CloudStack files shared between agent and management server

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b8ba24c/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index eea16ae..2b9aa71 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -1239,7 +1239,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements
Serv
         command.add("-p", cmdLine.replaceAll(" ", "%"));
         result = command.execute();
         if (result != null) {
-            s_logger.debug("passcmd failed:" + result);
+            s_logger.error("passcmd failed:" + result);
             return false;
         }
         return true;


Mime
View raw message