From: Kefu Chai <kchai@redhat.com>
Date: Tue, 20 Feb 2018 12:49:42 +0000 (+0800)
Subject: ceph-disk: include output of failed command in exception
X-Git-Tag: v13.0.2~195^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=48175c3a30c57537e967acef6a958ebdfd28d057;p=ceph.git

ceph-disk: include output of failed command in exception

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py
index dba0454828ddb..66d8f4416bb64 100644
--- a/src/ceph-disk/ceph_disk/main.py
+++ b/src/ceph-disk/ceph_disk/main.py
@@ -1251,7 +1251,7 @@ def get_conf_with_default(cluster, variable):
     except subprocess.CalledProcessError as e:
         raise Error(
             'getting variable from configuration failed',
-            e,
+            e, e.output,
         )
 
     value = str(out).split('\n', 1)[0]