openstack/charm-aodh
Code Issues Proposed changes

Rebuild for sync charms.openstck

Browse Source 
Additionally adds initialization for ceilometer
when requiring action be taken to unblock.

Change-Id: Iac55ca7323c201be8b6a9299946d196b2eb57572
Closes-Bug: #1813982
This commit is contained in:
David Ames 2019-02-01 16:12:59 -08:00 committed by Chris MacNaughton
parent 758654ac8e
commit ee68a502a3
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rebuild
View File

@ -2,4 +2,4 @@
# when dependencies of the charm change,
# but nothing in the charm needs to.
# simply change the uuid to something new
85c5499c-1a79-11e9-8864-470f2a69c15e
47685d4e-267f-11e9-b663-67c5a27a488e

27
src/tests/basic_deployment.py
View File

@ -34,11 +34,17 @@ class AodhBasicDeployment(OpenStackAmuletDeployment):
self._deploy()
u.log.info('Waiting on extended status checks...')
exclude_services = ['mongodb', 'memcached']
self._auto_wait_for_status(exclude_services=exclude_services)
self.exclude_services = ['mongodb', 'memcached']
if self._get_openstack_release() >= self.xenial_pike:
# Ceilometer will come up blocked until the ceilometer-upgrade
# action is run
self.exclude_services.append("ceilometer")
self._auto_wait_for_status(exclude_services=self.exclude_services)
self.d.sentry.wait()
self._initialize_tests()
if self._get_openstack_release() >= self.xenial_pike:
self.run_ceilometer_upgrade_action()
def _add_services(self):
"""Add services
@ -170,6 +176,23 @@ class AodhBasicDeployment(OpenStackAmuletDeployment):
return False
time.sleep(2)
def run_ceilometer_upgrade_action(self):
"""Run ceilometer-upgrade
This action will be run early to initialize ceilometer
when gnocchi is related.
Ceilometer will be in a blocked state until this runs.
"""
u.log.debug('Checking ceilometer-upgrade')
unit = self.ceil_sentry
action_id = unit.run_action("ceilometer-upgrade")
assert u.wait_on_action(action_id), "ceilometer-upgrade action failed"
# Wait for acivte Unit is ready on ceilometer
self.exclude_services.remove('ceilometer')
self._auto_wait_for_status(exclude_services=self.exclude_services)
u.log.debug('OK')
def test_100_services(self):
"""Verify the expected services are running on the corresponding
service units."""