openstack
/
fuel-octane
Code Issues Proposed changes

Catch general Exception on upgrade ceph osd 

This is reqired for pass check on ceph upgrade. In fuel/8.0 ceph
calculates wrong PGS count.

Change-Id: I46d4ef5c48d9cde682243e5f6cf8145aa115b3e2
Related-Bug: 1541418
Closes-Bug: 1622543
This commit is contained in:
Sergey Abramov 2016-08-01 12:32:57 +03:00
parent 5e6953bc93
commit 9a58209dc1
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.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):