openstack
/
charm-gnocchi
Code Issues Proposed changes

Override testing charms which don't support openstack-origin

This commit is contained in:
James Page 2017-08-02 13:38:07 +01:00
parent a626949459
commit 25a2f2f4a2
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tests/basic_deployment.py
View File

@ -30,6 +30,8 @@ class GnocchiCharmDeployment(amulet_deployment.OpenStackAmuletDeployment):
"""Amulet tests on a basic gnocchi deployment."""
gnocchi_svcs = ['haproxy', 'gnocchi-metricd', 'apache2']
no_origin = ['memcached', 'percona-cluster', 'rabbitmq-server',
'ceph-mon', 'ceph-osd']
def __init__(self, series, openstack=None, source=None, stable=False):
"""Deploy the entire test environment."""
@ -67,8 +69,11 @@ class GnocchiCharmDeployment(amulet_deployment.OpenStackAmuletDeployment):
{'name': 'ceph-mon', 'units': 3},
{'name': 'ceph-osd', 'units': 3},
]
super(GnocchiCharmDeployment, self)._add_services(this_service,
other_services)
super(GnocchiCharmDeployment, self)._add_services(
this_service,
other_services,
no_origin=self.no_origin
)
def _add_relations(self):
"""Add all of the relations for the services."""