Tools » teuthology

The old code behaved as follows:

@contextlib.contextmanager
def upgrade(ctx, config):
... common code that checks parameters, and builds dictionaries ... 
... of remote nodes and associated role information             ...
    loop through remote nodes:
         ... do some common stuff ...
         ...do some ceph install stuff (calls routines that make remote calls)...
    yield

The version in progress looks like:

def upgrade_common(ctx, config, upgrade_style):
... common code that checks parameters, and builds dictionaries ... 
... of remote nodes and associated role information             ...
    loop through remote nodes:
         ... do some common stuff ...
         call update_style

def upgrade_old_style(...):
    ...do some ceph install stuff (calls routines that make remote calls)...

def upgrade_using_ceph_deploy(...):
    ...upgrade using ceph deploy...

@contextlib.contextmanager
def upgrade(ctx, config):
    upgrade_common(ctx, config, upgrade_old_style)
    yield

@contextlib.contextmanager
def ceph_deploy_upgrade(ctx, config):
    upgrade_common(ctx, config, upgrade_using_ceph_deploy)
    yield

This change keeps the behavior of current upgrade/install.upgrade
lines in current yaml files the same. It allows yaml file lines
that contain install.ceph_deploy_upgrade instead of install.upgrade
to do the same installations using ceph_deploy.

The experimental wip that I have right now does the above, but the
upgrade_using_ceph_deploy method is not finished. The old upgrade
works fine, and ceph_deploy_upgrade worked when I stubbed it to behave
like the old_upgrade.

Commit 166c8af3 should resolve this