openstack
/
charm-nova-compute
Code Issues Proposed changes

Merge "Py3 Fixes"

This commit is contained in:
Zuul 2017-12-05 17:11:39 +00:00 committed by Gerrit Code Review
parent 77267efd51 4548b9d1f2
commit 8814ec7198
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hooks/charmhelpers/contrib/storage/linux/ceph.py
View File

@ -377,12 +377,12 @@ def get_mon_map(service):
try: try:
return json.loads(mon_status) return json.loads(mon_status)
except ValueError as v: except ValueError as v:
log("Unable to parse mon_status json: {}. Error: {}".format( log("Unable to parse mon_status json: {}. Error: {}"
mon_status, v.message)) .format(mon_status, str(v)))
raise raise
except CalledProcessError as e: except CalledProcessError as e:
log("mon_status command failed with message: {}".format( log("mon_status command failed with message: {}"
e.message)) .format(str(e)))
raise raise

8
tests/charmhelpers/contrib/storage/linux/ceph.py
View File

@ -377,12 +377,12 @@ def get_mon_map(service):
try: try:
return json.loads(mon_status) return json.loads(mon_status)
except ValueError as v: except ValueError as v:
log("Unable to parse mon_status json: {}. Error: {}".format( log("Unable to parse mon_status json: {}. Error: {}"
mon_status, v.message)) .format(mon_status, str(v)))
raise raise
except CalledProcessError as e: except CalledProcessError as e:
log("mon_status command failed with message: {}".format( log("mon_status command failed with message: {}"
e.message)) .format(str(e)))
raise raise