openstack/charm-neutron-api
Code Issues Proposed changes

amulet test - only check for neutron-metering-agent if not kilo

Browse Source
This commit is contained in:
Ryan Beisner 2015-04-19 04:02:15 +00:00
parent 765e894a08
commit f3b0370f7f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/basic_deployment.py
View File

@ -383,12 +383,15 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment):
'status neutron-lbaas-agent', 'status neutron-lbaas-agent',
'status neutron-metadata-agent', 'status neutron-metadata-agent',
'status neutron-plugin-openvswitch-agent', 'status neutron-plugin-openvswitch-agent',
'status neutron-metering-agent',
'status neutron-ovs-cleanup'] 'status neutron-ovs-cleanup']
if self._get_openstack_release() <= self.trusty_juno: if self._get_openstack_release() <= self.trusty_juno:
neutron_services.append('status neutron-vpn-agent') neutron_services.append('status neutron-vpn-agent')
if (self._get_openstack_release() != self.trusty_kilo and
self._get_openstack_release() != self.vivid_kilo):
neutron_services.append('status neutron-metering-agent')
nova_cc_services = ['status nova-api-ec2', nova_cc_services = ['status nova-api-ec2',
'status nova-api-os-compute', 'status nova-api-os-compute',
'status nova-objectstore', 'status nova-objectstore',