Browse Source

Merge "Catch general Exception on upgrade ceph osd"

Jenkins 2 years ago
parent
commit
413c6b03a8
1 changed files with 1 additions and 2 deletions
  1. 1
    2
      octane/handlers/upgrade/ceph_osd.py

+ 1
- 2
octane/handlers/upgrade/ceph_osd.py View File

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

Loading…
Cancel
Save