openstack
/
charm-cinder-backup
Code Issues Proposed changes

Enable tests/021-basic-xenial-mitaka amulet 

The tests/021-basic-xenial-mitaka amulet test was present but not
enabled. This test now passes and can be enabled

templates/.gitignore was added to workaround https://goo.gl/Je1Mm7

Change-Id: I8bfaa9bc3c2afb053e05216c8056955d354e4baa
This commit is contained in:
Liam Young 2016-04-12 06:31:09 +00:00
parent a133878bb1
commit 222443b4ad
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
templates/.gitignore vendored Normal file
View File

9
tests/021-basic-xenial-mitaka Executable file
View File

@ -0,0 +1,9 @@
#!/usr/bin/python
"""Amulet tests on a basic cinder-backup deployment on xenial-mitaka."""
from basic_deployment import CinderBackupBasicDeployment
if __name__ == '__main__':
deployment = CinderBackupBasicDeployment(series='xenial')
deployment.run_tests()

17
tests/basic_deployment.py
View File

@ -206,6 +206,9 @@ class CinderBackupBasicDeployment(OpenStackAmuletDeployment):
services[self.ceph1_sentry] = ceph_services services[self.ceph1_sentry] = ceph_services
services[self.ceph2_sentry] = ceph_services services[self.ceph2_sentry] = ceph_services
if self._get_openstack_release() >= self.trusty_liberty:
services[self.keystone_sentry] = ['apache2']
ret = u.validate_services_by_name(services) ret = u.validate_services_by_name(services)
if ret: if ret:
amulet.raise_status(amulet.FAIL, msg=ret) amulet.raise_status(amulet.FAIL, msg=ret)
@ -514,6 +517,8 @@ class CinderBackupBasicDeployment(OpenStackAmuletDeployment):
auth_uri = 'http://' + rel_ks_ci['auth_host'] + \ auth_uri = 'http://' + rel_ks_ci['auth_host'] + \
':' + rel_ks_ci['service_port'] + '/' ':' + rel_ks_ci['service_port'] + '/'
auth_url = ('http://%s:%s/' %
(rel_ks_ci['auth_host'], rel_ks_ci['auth_port']))
expected = { expected = {
'DEFAULT': { 'DEFAULT': {
@ -549,6 +554,18 @@ class CinderBackupBasicDeployment(OpenStackAmuletDeployment):
'rabbit_password': rel_mq_ci['password'], 'rabbit_password': rel_mq_ci['password'],
'rabbit_host': rel_mq_ci['hostname'], 'rabbit_host': rel_mq_ci['hostname'],
} }
if self._get_openstack_release() >= self.trusty_liberty:
expected['keystone_authtoken'] = {
'auth_uri': auth_uri.rstrip('/'),
'auth_url': auth_url.rstrip('/'),
'auth_plugin': 'password',
'project_domain_id': 'default',
'user_domain_id': 'default',
'project_name': 'services',
'username': rel_ks_ci['service_username'],
'password': rel_ks_ci['service_password'],
'signing_dir': '/var/cache/cinder'
}
if self._get_openstack_release() >= self.trusty_kilo: if self._get_openstack_release() >= self.trusty_kilo:
# Kilo or later # Kilo or later