openstack/charm-nova-compute
Code Issues Proposed changes

Check for Keystone apache2 process for liberty+

Browse Source 
The keystone charm recently changed to run keystone as a wsgi
process under Apache2; refactor amulet test to ensure that
apache2 is checked instead of keystone for >= liberty.

Change-Id: If3c330f3fc9167bede10b407bbe00395c951215e
This commit is contained in:
James Page 2016-04-07 15:27:54 +01:00
parent 390880e3df
commit ed44ac98d0
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/basic_deployment.py
View File

@ -192,6 +192,9 @@ class NovaBasicDeployment(OpenStackAmuletDeployment):
if self._get_openstack_release() >= self.precise_grizzly: if self._get_openstack_release() >= self.precise_grizzly:
services[self.nova_cc_sentry] = ['nova-conductor'] services[self.nova_cc_sentry] = ['nova-conductor']
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)