Update functional test model to use cinder-ceph subordinate
Change-Id: I82054066df7440a9396b1e193d1f1059e567a769 Related-Bug: #1719742
This commit is contained in:
parent
a9e0996eba
commit
ae9fa42947
|
@ -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'
|
||||
|
|
|
@ -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'
|
||||
]
|
||||
|
||||
|
|
Loading…
Reference in New Issue