From 85b32e9c53ea44c4ff6380419d195cd8b348357f Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Thu, 7 Apr 2016 15:03:51 +0100
Subject: [PATCH] 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
---
 tests/basic_deployment.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 63ddca40..c890f210 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -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)