openstack
/
charm-gnocchi
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: If09343a31400e0a12bdcd9cbf9db55e7f6dc3160
Related-Bug: #1698154
This commit is contained in:
Chris MacNaughton 2018-06-04 17:31:48 +02:00
parent 436a12483d
commit d15fcd37a0
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/tests/basic_deployment.py
View File

@ -67,7 +67,8 @@ class GnocchiCharmDeployment(amulet_deployment.OpenStackAmuletDeployment):
{'name': 'rabbitmq-server'},
{'name': 'memcached', 'location': 'cs:memcached'},
{'name': 'ceph-mon', 'units': 3},
{'name': 'ceph-osd', 'units': 3},
{'name': 'ceph-osd', 'units': 3,
'storage': {'osd-devices': 'cinder,10G'}},
]
if self._get_openstack_release() < self.xenial_queens:
@ -104,14 +105,10 @@ class GnocchiCharmDeployment(amulet_deployment.OpenStackAmuletDeployment):
"""Configure all of the services."""
keystone_config = {'admin-password': 'openstack',
'admin-token': 'ubuntutesting'}
ceph_osd_config = {'osd-devices': '/dev/vdb',
'osd-reformat': True,
'ephemeral-unmount': '/mnt'}
gnocchi_config = {}
if self.snap_source:
gnocchi_config['openstack-origin'] = self.snap_source
configs = {'keystone': keystone_config,
'ceph-osd': ceph_osd_config,
'gnocchi': gnocchi_config}
super(GnocchiCharmDeployment, self)._configure_services(configs)