From d24b04241aab104db8c99f25c0ec1701e1267031 Mon Sep 17 00:00:00 2001
From: Chris MacNaughton <chris.macnaughton@canonical.com>
Date: Mon, 4 Jun 2018 17:30:53 +0200
Subject: [PATCH] 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
---
 src/tests/basic_deployment.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/tests/basic_deployment.py b/src/tests/basic_deployment.py
index 44fbc21..4801bb5 100644
--- a/src/tests/basic_deployment.py
+++ b/src/tests/basic_deployment.py
@@ -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 = {