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: I5655c70b96a0107319f13d653df426d0983fb0eb
Related-Bug: #1698154
This commit is contained in:
Chris MacNaughton 2018-06-04 17:30:18 +02:00
parent 92cfd43285
commit 2a7eb1a0f1
1 changed files with 2 additions and 5 deletions

View File

@ -59,7 +59,8 @@ class AodhBasicDeployment(OpenStackAmuletDeployment):
{'name': 'gnocchi'},
{'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'}}])
else:
other_services.append({
'name': 'mongodb',
@ -111,10 +112,6 @@ class AodhBasicDeployment(OpenStackAmuletDeployment):
'keystone': keystone_config,
'percona-cluster': pxc_config,
}
if self._get_openstack_release() >= self.xenial_queens:
configs['ceph-osd'] = {'osd-devices': '/dev/vdb',
'osd-reformat': True,
'ephemeral-unmount': '/mnt'}
super(AodhBasicDeployment, self)._configure_services(configs)
def _get_token(self):