Merge "Catch general Exception on upgrade ceph osd"
This commit is contained in:
commit
413c6b03a8
|
@ -15,7 +15,6 @@ import logging
|
|||
from octane.handlers import upgrade
|
||||
from octane.util import ceph
|
||||
from octane.util import node as node_util
|
||||
from octane.util import subprocess
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
@ -26,7 +25,7 @@ class CephOsdUpgrade(upgrade.UpgradeHandler):
|
|||
def preupgrade(self):
|
||||
try:
|
||||
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)
|
||||
|
||||
def prepare(self):
|
||||
|
|
Loading…
Reference in New Issue