Merge pull request #20497 from tchaikov/wip-ceph-disk-cmd-failure

ceph-disk: include output of failed command in exception

Reviewed-by: Alfredo Deza <adeza@redhat.com>
This commit is contained in:
Kefu Chai 2018-02-24 12:20:53 +08:00 committed by GitHub
commit 7a944125a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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]