openstack
/
charm-ceph-mon
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: Ie61cc1ecae4b55e6e12b249b7765b01644126c7c
This commit is contained in:
James Page 2016-04-07 15:03:51 +01:00
parent a91fb89c69
commit 85b32e9c53
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

@ -224,6 +224,9 @@ class CephBasicDeployment(OpenStackAmuletDeployment):
services[self.ceph_osd_sentry] = ceph_osd_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)