syncing current charms.ceph into ceph-osd causes breakages

[Edward Hope-Morley]

this is the amulet test failure that resulted from a charms.ceph sync into ceph-osd charm - https://pastebin.ubuntu.com/p/8htG3Tt25J/

this is the full run that hit the issue - https://openstack-ci-reports.ubuntu.com/artifacts/test_charm_pipeline_func_smoke/openstack/charm-ceph-osd/681342/1/12221/index.html

[Ryan Beisner (1chb1n)]

Confirmed, and I view this as a crit blocker for moving the ceph-* charm development forward.

Reproducer: do a `make sync && make ceph-sync` on the ceph-osd charm, then run unit tests with `tox -e py35` or `tox -e py37`.

[Ryan Beisner (1chb1n)]

FYI, same for ceph-radosgw

[Ryan Beisner (1chb1n)]

https://review.opendev.org/#/q/topic:bug/1845975+(status:open+OR+status:merged)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/685879
Committed: https://git.openstack.org/cgit/openstack/charm-ceph-osd/commit/?id=23103d295828e3338859d536779118450cd69683
Submitter: Zuul
Branch: master

commit 23103d295828e3338859d536779118450cd69683
Author: Chris MacNaughton <email address hidden>
Date: Tue Oct 1 08:09:47 2019 +0200

    Use charm-internal _upgrade_keyring

    This change includes a charms.ceph sync.

    The _upgrade_keyring function was removed from charms.ceph
    so this charm needs to use the already-existing, charm-
    internal version.

    Change-Id: Ia7cf352a2456dc85aca6f61d2e88327cd0c15f7e
    Closes-Bug: #1845975