openstack
/
charm-ceilometer-agent
Code Issues Proposed changes

Fix test_303 for pre-mitaka 

test_303_nova_ceilometer_config_check_endpoint was recently
introduced but it expects ceilometer-polling aganet to be present
which it is not on pre-liberty releases. This change fixes that
assumption and updates the expected keyword for earlier releases.

Change-Id: I1d6cb06433f70a2c0225cafb77f3a2cbbfe703b7
Closes-Bug: #1729346
This commit is contained in:
Liam Young 2017-11-01 16:13:37 +00:00
parent 7569c2d64e
commit 904aa0d604
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/basic_deployment.py
View File

@ -601,13 +601,22 @@ class CeiloAgentBasicDeployment(OpenStackAmuletDeployment):
'DEFAULT': {
'logdir': '/var/log/ceilometer'
},
'service_credentials': {
'interface': 'internalURL'
},
}
juju_service = 'ceilometer-agent'
service = 'ceilometer-polling'
if self._get_openstack_release() >= self.xenial_ocata:
service = 'ceilometer-polling: AgentManager worker(0)'
elif self._get_openstack_release() >= self.xenial_newton:
service = 'ceilometer-polling - AgentManager(0)'
elif self._get_openstack_release() >= self.trusty_liberty:
service = 'ceilometer-polling'
else:
service = 'ceilometer-agent-compute'
if self._get_openstack_release() >= self.trusty_mitaka:
int_value = 'internalURL'
else:
int_value = 'internal'
expected_alternate['service_credentials'] = {'interface': int_value}
option = 'use-internal-endpoints'
set_default = {option: 'False'}
set_alternate = {option: 'True'}