Update amulet test definitions
Change-Id: Iaf46e2339e8d6afda6524b3fdeae6c0af780c0c2
This commit is contained in:
parent
f0b681f94c
commit
1b61475baf
|
@ -210,7 +210,11 @@ class CephFsBasicDeployment(OpenStackAmuletDeployment):
|
|||
"""Check osd pools on all ceph units, expect them to be
|
||||
identical, and expect specific pools to be present."""
|
||||
u.log.debug('Checking pools on ceph units...')
|
||||
expected_pools = ['rbd', 'ceph-fs_data', 'ceph-fs_metadata']
|
||||
|
||||
if self._get_openstack_release() >= self.xenial_pike:
|
||||
expected_pools = ['ceph-fs_data', 'ceph-fs_metadata']
|
||||
else:
|
||||
expected_pools = ['rbd', 'ceph-fs_data', 'ceph-fs_metadata']
|
||||
results = []
|
||||
sentries = [
|
||||
self.ceph_mon0_sentry,
|
||||
|
|
|
@ -0,0 +1,23 @@
|
|||
#!/usr/bin/env python
|
||||
#
|
||||
# Copyright 2016 Canonical Ltd
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
"""Amulet tests on a basic ceph deployment on artful-pike."""
|
||||
|
||||
from basic_deployment import CephFsBasicDeployment
|
||||
|
||||
if __name__ == '__main__':
|
||||
deployment = CephFsBasicDeployment(series='artful')
|
||||
deployment.run_tests()
|
|
@ -20,4 +20,4 @@ from basic_deployment import CephFsBasicDeployment
|
|||
|
||||
if __name__ == '__main__':
|
||||
deployment = CephFsBasicDeployment(series='xenial')
|
||||
deployment.run_tests()
|
||||
deployment.run_tests()
|
||||
|
|
Loading…
Reference in New Issue