openstack
/
charm-ceph-mon
Code Issues Proposed changes

remove trusty requirement to allow xenial upgrades 

Closes-Bug: #1709962
Closes-Bug: #1710645
Change-Id: I442072e0c10d0df95c40232f0191f5cc8b63ee8c
This commit is contained in:
Chris MacNaughton 2017-08-21 16:12:21 +02:00
parent 382c446b2d
commit 07312cfa09
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hooks/ceph_hooks.py
View File

@ -26,7 +26,6 @@ from ceph.broker import (
process_requests
)
from charmhelpers.core import host
from charmhelpers.core import hookenv
from charmhelpers.core.hookenv import (
log,
@ -92,12 +91,6 @@ def check_for_upgrade():
log("Ceph is not bootstrapped, skipping upgrade checks.")
return
release_info = host.lsb_release()
if not release_info['DISTRIB_CODENAME'] == 'trusty':
log("Invalid upgrade path from {}. Only trusty is currently "
"supported".format(release_info['DISTRIB_CODENAME']))
return
c = hookenv.config()
old_version = ceph.resolve_ceph_version(c.previous('source') or
'distro')

12
unit_tests/test_upgrade.py
View File

@ -20,15 +20,11 @@ class UpgradeRollingTestCase(unittest.TestCase):
@patch('ceph_hooks.ceph.is_bootstrapped')
@patch('ceph_hooks.ceph.resolve_ceph_version')
@patch('ceph_hooks.hookenv')
@patch('ceph_hooks.host')
@patch('ceph_hooks.ceph.roll_monitor_cluster')
def test_check_for_upgrade(self, roll_monitor_cluster, host, hookenv,
def test_check_for_upgrade(self, roll_monitor_cluster, hookenv,
version, is_bootstrapped):
is_bootstrapped.return_value = True
version.side_effect = ['firefly', 'hammer']
host.lsb_release.return_value = {
'DISTRIB_CODENAME': 'trusty',
}
previous_mock = MagicMock().return_value
previous_mock.previous.return_value = "cloud:trusty-juno"
hookenv.config.side_effect = [previous_mock,
@ -42,16 +38,12 @@ class UpgradeRollingTestCase(unittest.TestCase):
@patch('ceph_hooks.ceph.is_bootstrapped')
@patch('ceph_hooks.ceph.resolve_ceph_version')
@patch('ceph_hooks.hookenv')
@patch('ceph_hooks.host')
@patch('ceph_hooks.ceph.roll_monitor_cluster')
def test_check_for_upgrade_not_bootstrapped(self, roll_monitor_cluster,
host, hookenv,
hookenv,
version, is_bootstrapped):
is_bootstrapped.return_value = False
version.side_effect = ['firefly', 'hammer']
host.lsb_release.return_value = {
'DISTRIB_CODENAME': 'trusty',
}
previous_mock = MagicMock().return_value
previous_mock.previous.return_value = "cloud:trusty-juno"
hookenv.config.side_effect = [previous_mock,