Commit Graph

8 Commits

Author SHA1 Message Date
Corey Bryant fcfa499f11 Rename lib/ceph to lib/charms_ceph
The new python3-ceph-common deb package (introduced in ceph octopus)
adds a new ceph directory (a parent package in python terms) in
/usr/lib/python3/dist-packages/ceph/. This results in a conflict with
charm-ceph-osd/lib/ceph/. For example, with the current import of
ceph.utils in hooks/ceph_hooks.py, Python finds no utils.py in
/usr/lib/python3/dist-packages/ceph/ and then stops searching.
Therefore, rename lib/ceph to lib/charms_ceph to avoid the conflict.

Depends-On: https://review.opendev.org/#/c/709226
Change-Id: I13ae7c048d8f1eef2ea64b13ae14b51dbfaaf3cd
2020-02-24 15:21:33 +00:00
Corey Bryant d4a6142a03 Sync charm-helpers for Ussuri/Focal release and version details
Change-Id: I5ac45332a126143ce0299c2c534523bd890f5f57
2020-01-17 14:21:26 -05:00
Liam Young 8655dbd9e3 udevadm settle before processing osd-devices
Run udevadm settle before processing osd-devices as there may by
udev events that have been queued for processing on server startup.

Includes charms.ceph sync

Corresponding charms.ceph change is:
Iec5932a4d819ad87e54c2af391abe1befe84f164

Change-Id: Ia4210d6a5c2c8a0b0e2038b25f24d2d82600e10a
Closes-Bug: #1812925
2019-03-05 07:59:46 +00:00
Dmitrii Shcherbakov e340cc851c ignore devices that have already been processed
Similar to how osdize in charms.ceph checks for already processed
devices we need to avoid checking if they are pristine or not.

Additionally, mapped LUKS devices need to be filtered from being zapped
as they may hold valuable data. They are only used as underlying devices
for device mapper and dmcrypt to provide a decrypted block device
abstration so if they really need to be zapped a mapping needs to be
removed first.

This change also pulls charms.ceph modifications.

Change-Id: I96b3d40b3f9e56681be142377e454b15f9e22be3
Co-Authored-By: Dmitrii Shcherbakov <dmitrii.shcherbakov@canonical.com>
Co-Authored-By: Chris Procter <chris.procter@canonical.com>
Closes-Bug: 1781453
2018-07-17 14:30:51 +03:00
James Page 4846c5654c Support use of partitions with ceph-volume
Resync ceph helpers to support use of partitions and bcache devices
for OSD filestore, blockstore, journal, db and wal devices.

Change-Id: Iac5eefc4c3f53b1ec2f5cfc6e98a9a2168c1c0b6
Closes-Bug: 1769678
2018-05-08 11:47:57 +02:00
James Page de3b55a4e7 Resync ceph helpers for misc fixes
Pickup fixes for upgrade from Jewel -> Luminous.

Change-Id: I3ffeebc38464096724ca0fd40f1cf29cf3e7fe4f
Closes-Bug: 1742082
Closes-Bug: 1742083
Closes-Bug: 1742120
Closes-Bug: 1742079
Closes-Bug: 1742408
2018-01-10 11:31:53 +00:00
Alex Kavanagh 4e1ecd55b8 Bring ceph-osd to Python 3
* Synced version of charm-helpers
* Synced version of charms.ceph to bring in Py3 compatible library
  methods.

Change-Id: I5ac45740f48a71d9cb0c5943472fc8590a723514
2017-11-17 12:13:54 +00:00
Edward Hope-Morley 4bcdddc4a3 Sync charms.ceph to get code cleanup changes
Also had to fix some imports due to changes
implemented as part of the cleanup.

Change-Id: Ie232828056a7f15525f820e8e106264b22697168
2017-08-14 14:46:38 +01:00