From f3b0370f7fe24531e952c325097d0d45c09c4308 Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Sun, 19 Apr 2015 04:02:15 +0000 Subject: [PATCH] amulet test - only check for neutron-metering-agent if not kilo --- tests/basic_deployment.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 32a00882..1c81a1ac 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -383,12 +383,15 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment): 'status neutron-lbaas-agent', 'status neutron-metadata-agent', 'status neutron-plugin-openvswitch-agent', - 'status neutron-metering-agent', 'status neutron-ovs-cleanup'] if self._get_openstack_release() <= self.trusty_juno: 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', 'status nova-api-os-compute', 'status nova-objectstore',