openstack
/
fuel-octane
Code Issues Proposed changes

Merge "Catch general Exception on upgrade ceph osd"

This commit is contained in:
Jenkins 2016-09-16 11:35:55 +00:00 committed by Gerrit Code Review
parent adf928ece2 9a58209dc1
commit 413c6b03a8
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
octane/handlers/upgrade/ceph_osd.py
View File

@ -15,7 +15,6 @@ import logging
from octane.handlers import upgrade from octane.handlers import upgrade
from octane.util import ceph from octane.util import ceph
from octane.util import node as node_util from octane.util import node as node_util
from octane.util import subprocess
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -26,7 +25,7 @@ class CephOsdUpgrade(upgrade.UpgradeHandler):
def preupgrade(self): def preupgrade(self):
try: try:
ceph.check_cluster(self.node) ceph.check_cluster(self.node)
except subprocess.CalledProcessError as exc: except Exception as exc:
LOG.warning("Ceph cluster health is not OK, ignoring: %s", exc) LOG.warning("Ceph cluster health is not OK, ignoring: %s", exc)
def prepare(self): def prepare(self):