openstack/charm-ceph-osd
Code Issues Proposed changes

Rename lib/ceph to lib/charms_ceph

Browse Source 
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
This commit is contained in:
Corey Bryant
2020-02-21 18:22:58 +00:00
parent 81a11f4d7f
commit fcfa499f11
13 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/ceph_hooks.py
View File

@@ -25,7 +25,7 @@ import subprocess
import sys
sys.path.append('lib')
import ceph.utils as ceph
import charms_ceph.utils as ceph
from charmhelpers.core import hookenv
from charmhelpers.core.hookenv import (
log,