openstack
/
charm-ceph-fs
Code Issues Proposed changes

Update tests to use Juju storage 

Due to changes to the ceph-osd charm, it is
suggested to use Juju storage for testing.

Change-Id: I844030005f7a470a286039d58580fa1701144a8b
Related-Bug: #1698154
This commit is contained in:
Chris MacNaughton 2018-06-04 17:30:53 +02:00
parent f8742ebe57
commit d24b04241a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/tests/basic_deployment.py
View File

@ -63,7 +63,8 @@ class CephFsBasicDeployment(OpenStackAmuletDeployment):
this_service = {'name': 'ceph-fs', 'units': 1}
other_services = [
{'name': 'ceph-mon', 'units': 3},
{'name': 'ceph-osd', 'units': 3},
{'name': 'ceph-osd', 'units': 3,
'storage': {'osd-devices': 'cinder,10G'}},
]
super(CephFsBasicDeployment, self)._add_services(this_service,
other_services,
@ -94,10 +95,8 @@ class CephFsBasicDeployment(OpenStackAmuletDeployment):
# Include a non-existent device as osd-devices is a whitelist,
# and this will catch cases where proposals attempt to change that.
ceph_osd_config = {
'osd-reformat': True,
'ephemeral-unmount': '/mnt',
'osd-devices': '/dev/vdb /srv/ceph /dev/test-non-existent',
'source': self.source,
'osd-devices': '/srv/ceph /dev/test-non-existent',
}
configs = {