36d5e14d17
During ceph to ceph-osd/ceph-mon migrations, the bootstrap keyring for the cluster will be in place as the ceph-osd units are started alongside existing ceph units. Switch this check to look for the upgrade keyring, which won't be in place until the ceph-osd <-> ceph-mon relation is complete, at which point in time a) the unit has the correct access to perform the upgrade and b) the previous/current version check code will not trip over due to the previous value of the source option being None, resulting in a fallback to 'distro' as the previous source of ceph. Change-Id: I10895c60aeb543a10461676e4455ed6b5e2fdb46 Closes-Bug: 1729369
87 lines
3.5 KiB
Python
87 lines
3.5 KiB
Python
import unittest
|
|
|
|
__author__ = 'Chris Holcombe <chris.holcombe@canonical.com>'
|
|
|
|
from mock import call, patch, MagicMock
|
|
|
|
from ceph_hooks import check_for_upgrade
|
|
|
|
|
|
def config_side_effect(*args):
|
|
if args[0] == 'source':
|
|
return 'cloud:trusty-kilo'
|
|
elif args[0] == 'key':
|
|
return 'key'
|
|
elif args[0] == 'release-version':
|
|
return 'cloud:trusty-kilo'
|
|
|
|
|
|
class UpgradeRollingTestCase(unittest.TestCase):
|
|
|
|
@patch('ceph_hooks.ceph.dirs_need_ownership_update')
|
|
@patch('ceph_hooks.os.path.exists')
|
|
@patch('ceph_hooks.ceph.resolve_ceph_version')
|
|
@patch('ceph_hooks.emit_cephconf')
|
|
@patch('ceph_hooks.hookenv')
|
|
@patch('ceph_hooks.ceph.roll_osd_cluster')
|
|
def test_check_for_upgrade(self, roll_osd_cluster, hookenv,
|
|
emit_cephconf, version, exists,
|
|
dirs_need_ownership_update):
|
|
dirs_need_ownership_update.return_value = False
|
|
exists.return_value = True
|
|
version.side_effect = ['firefly', 'hammer']
|
|
previous_mock = MagicMock().return_value
|
|
previous_mock.previous.return_value = "cloud:trusty-juno"
|
|
hookenv.config.side_effect = [previous_mock,
|
|
config_side_effect('source')]
|
|
check_for_upgrade()
|
|
|
|
roll_osd_cluster.assert_called_with(new_version='hammer',
|
|
upgrade_key='osd-upgrade')
|
|
emit_cephconf.assert_has_calls([call(upgrading=True),
|
|
call(upgrading=False)])
|
|
exists.assert_called_with(
|
|
"/var/lib/ceph/osd/ceph.client.osd-upgrade.keyring")
|
|
|
|
@patch('ceph_hooks.ceph.dirs_need_ownership_update')
|
|
@patch('ceph_hooks.os.path.exists')
|
|
@patch('ceph_hooks.ceph.resolve_ceph_version')
|
|
@patch('ceph_hooks.emit_cephconf')
|
|
@patch('ceph_hooks.hookenv')
|
|
@patch('ceph_hooks.ceph.roll_osd_cluster')
|
|
def test_resume_failed_upgrade(self, roll_osd_cluster,
|
|
hookenv, emit_cephconf, version,
|
|
exists,
|
|
dirs_need_ownership_update):
|
|
dirs_need_ownership_update.return_value = True
|
|
exists.return_value = True
|
|
version.side_effect = ['jewel', 'jewel']
|
|
|
|
check_for_upgrade()
|
|
|
|
roll_osd_cluster.assert_called_with(new_version='jewel',
|
|
upgrade_key='osd-upgrade')
|
|
emit_cephconf.assert_has_calls([call(upgrading=True),
|
|
call(upgrading=False)])
|
|
exists.assert_called_with(
|
|
"/var/lib/ceph/osd/ceph.client.osd-upgrade.keyring")
|
|
|
|
@patch('ceph_hooks.os.path.exists')
|
|
@patch('ceph_hooks.ceph.resolve_ceph_version')
|
|
@patch('ceph_hooks.hookenv')
|
|
@patch('ceph_hooks.ceph.roll_monitor_cluster')
|
|
def test_check_for_upgrade_not_bootstrapped(self, roll_monitor_cluster,
|
|
hookenv,
|
|
version, exists):
|
|
exists.return_value = False
|
|
version.side_effect = ['firefly', 'hammer']
|
|
previous_mock = MagicMock().return_value
|
|
previous_mock.previous.return_value = "cloud:trusty-juno"
|
|
hookenv.config.side_effect = [previous_mock,
|
|
config_side_effect('source')]
|
|
check_for_upgrade()
|
|
|
|
roll_monitor_cluster.assert_not_called()
|
|
exists.assert_called_with(
|
|
"/var/lib/ceph/osd/ceph.client.osd-upgrade.keyring")
|