openstack
/
charm-ceph
Code Issues Proposed changes

Check for Keystone apache2 process for liberty+ 

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: If0767f27d669c073d48f12179bbbe9256cbc0247
This commit is contained in:
James Page 2016-04-07 15:06:21 +01:00
parent 97823569a5
commit dda294951d
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

@ -221,6 +221,9 @@ class CephBasicDeployment(OpenStackAmuletDeployment):
services[self.ceph1_sentry] = ceph_services
services[self.ceph2_sentry] = ceph_services
if self._get_openstack_release() >= self.trusty_liberty:
services[self.keystone_sentry] = ['apache2']
ret = u.validate_services_by_name(services)
if ret:
amulet.raise_status(amulet.FAIL, msg=ret)