Clean up dependency chain
This includes a resync of charms_ceph to raise the directory one level The charms_ceph change that we're syncing in changes the name of the ceph.py file into the __init__.py file to remove the second level of namespacing Change-Id: I8773a26266a2a13f92083e89db957a6454df9bb3
This commit is contained in:
parent
5bfbd7417a
commit
811bc04e7c
|
@ -7,3 +7,4 @@ bin
|
||||||
.idea
|
.idea
|
||||||
*.pyc
|
*.pyc
|
||||||
.unit-state.db
|
.unit-state.db
|
||||||
|
func-results.json
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -25,7 +25,7 @@ ch-sync: bin/charm_helpers_sync.py
|
||||||
$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml
|
$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml
|
||||||
$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml
|
$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml
|
||||||
git-sync: bin/git_sync.py
|
git-sync: bin/git_sync.py
|
||||||
$(PYTHON) bin/git_sync.py -d lib/ceph -s https://github.com/CanonicalLtd/charms_ceph.git
|
$(PYTHON) bin/git_sync.py -d lib -s https://github.com/CanonicalLtd/charms_ceph.git
|
||||||
|
|
||||||
sync: git-sync ch-sync
|
sync: git-sync ch-sync
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@ from charmhelpers.core.hookenv import (
|
||||||
action_fail,
|
action_fail,
|
||||||
)
|
)
|
||||||
|
|
||||||
from ceph.ceph.ceph import get_local_osd_ids
|
from ceph import get_local_osd_ids
|
||||||
from ceph_hooks import assess_status
|
from ceph_hooks import assess_status
|
||||||
|
|
||||||
from utils import (
|
from utils import (
|
||||||
|
|
|
@ -22,8 +22,8 @@ import sys
|
||||||
import time
|
import time
|
||||||
|
|
||||||
sys.path.append('lib')
|
sys.path.append('lib')
|
||||||
from ceph.ceph import ceph
|
import ceph
|
||||||
from ceph.ceph.ceph_broker import (
|
from ceph.ceph_broker import (
|
||||||
process_requests
|
process_requests
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
1183
lib/ceph/__init__.py
1183
lib/ceph/__init__.py
File diff suppressed because it is too large
Load Diff
|
@ -1 +0,0 @@
|
||||||
__author__ = 'chris'
|
|
File diff suppressed because it is too large
Load Diff
|
@ -22,7 +22,7 @@ from charmhelpers.core.hookenv import (
|
||||||
INFO,
|
INFO,
|
||||||
ERROR,
|
ERROR,
|
||||||
)
|
)
|
||||||
from charmhelpers.contrib.storage.linux.ceph import (
|
from charmhelpers.contrib.storage.linux.ceph import (
|
||||||
create_erasure_profile,
|
create_erasure_profile,
|
||||||
delete_pool,
|
delete_pool,
|
||||||
erasure_profile_exists,
|
erasure_profile_exists,
|
||||||
|
@ -191,7 +191,7 @@ def handle_replicated_pool(request, service):
|
||||||
replicas = request.get('replicas')
|
replicas = request.get('replicas')
|
||||||
quota = request.get('max-bytes')
|
quota = request.get('max-bytes')
|
||||||
weight = request.get('weight')
|
weight = request.get('weight')
|
||||||
|
|
||||||
# Optional params
|
# Optional params
|
||||||
pg_num = request.get('pg_num')
|
pg_num = request.get('pg_num')
|
||||||
if pg_num:
|
if pg_num:
|
|
@ -20,7 +20,7 @@ from mock import (
|
||||||
patch,
|
patch,
|
||||||
)
|
)
|
||||||
|
|
||||||
from ceph.ceph import ceph_broker
|
from ceph import ceph_broker
|
||||||
|
|
||||||
|
|
||||||
class TestCephOps(unittest.TestCase):
|
class TestCephOps(unittest.TestCase):
|
||||||
|
|
Loading…
Reference in New Issue