From ae9fa429476007737594e7e970b40866b19d2c54 Mon Sep 17 00:00:00 2001
From: Frode Nordahl <frode.nordahl@gmail.com>
Date: Mon, 23 Oct 2017 23:50:44 +0200
Subject: [PATCH] Update functional test model to use cinder-ceph subordinate

Change-Id: I82054066df7440a9396b1e193d1f1059e567a769
Related-Bug: #1719742
---
 tests/basic_deployment.py                         | 15 ++++++---------
 .../contrib/openstack/amulet/deployment.py        |  4 ++--
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index ac1fba18..c9b39863 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -66,7 +66,8 @@ class CephRadosGwBasicDeployment(OpenStackAmuletDeployment):
             {'name': 'rabbitmq-server'},
             {'name': 'nova-compute'},
             {'name': 'glance'},
-            {'name': 'cinder'}
+            {'name': 'cinder'},
+            {'name': 'cinder-ceph'},
         ]
         super(CephRadosGwBasicDeployment, self)._add_services(this_service,
                                                               other_services)
@@ -87,9 +88,10 @@ class CephRadosGwBasicDeployment(OpenStackAmuletDeployment):
             'cinder:identity-service': 'keystone:identity-service',
             'cinder:amqp': 'rabbitmq-server:amqp',
             'cinder:image-service': 'glance:image-service',
-            'cinder:ceph': 'ceph:client',
+            'cinder-ceph:storage-backend': 'cinder:storage-backend',
+            'cinder-ceph:ceph': 'ceph:client',
             'ceph-radosgw:mon': 'ceph:radosgw',
-            'ceph-radosgw:identity-service': 'keystone:identity-service'
+            'ceph-radosgw:identity-service': 'keystone:identity-service',
         }
         super(CephRadosGwBasicDeployment, self)._add_relations(relations)
 
@@ -462,12 +464,7 @@ class CephRadosGwBasicDeployment(OpenStackAmuletDeployment):
         u.log.debug('Checking cinder (rbd) config file data...')
         unit = self.cinder_sentry
         conf = '/etc/cinder/cinder.conf'
-        # NOTE(jamespage): Deal with section config for >= ocata.
-        if self._get_openstack_release() >= self.xenial_ocata:
-            section_key = 'CEPH'
-        else:
-            section_key = 'DEFAULT'
-
+        section_key = 'cinder-ceph'
         expected = {
             section_key: {
                 'volume_driver': 'cinder.volume.drivers.rbd.RBDDriver'
diff --git a/tests/charmhelpers/contrib/openstack/amulet/deployment.py b/tests/charmhelpers/contrib/openstack/amulet/deployment.py
index 5c041d2c..fc20a76d 100644
--- a/tests/charmhelpers/contrib/openstack/amulet/deployment.py
+++ b/tests/charmhelpers/contrib/openstack/amulet/deployment.py
@@ -307,7 +307,7 @@ class OpenStackAmuletDeployment(AmuletDeployment):
             # Kilo or later
             pools = [
                 'rbd',
-                'cinder',
+                'cinder-ceph',
                 'glance'
             ]
         else:
@@ -316,7 +316,7 @@ class OpenStackAmuletDeployment(AmuletDeployment):
                 'data',
                 'metadata',
                 'rbd',
-                'cinder',
+                'cinder-ceph',
                 'glance'
             ]