Run ceilometer-upgrade for all gnocchi tests

The ceilometer-upgrade action is required for all gnocchi tests because
the ceilometer-upgrade action is required whenever gnocchi is related to
ceilomter.

Change-Id: I95b5368e969bfbafceef2594625810f13c590a82
This commit is contained in:
David Ames 2019-02-06 16:38:33 +00:00 committed by Chris MacNaughton (icey)
parent 7f1ea17ec4
commit 4f48b46f17
1 changed files with 4 additions and 6 deletions

View File

@ -49,15 +49,13 @@ class GnocchiCharmDeployment(amulet_deployment.OpenStackAmuletDeployment):
u.log.info('Waiting on extended status checks...')
self.exclude_services = ['mysql', '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")
# 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._initialize_tests()
if self._get_openstack_release() >= self.xenial_pike:
self.run_ceilometer_upgrade_action()
self.run_ceilometer_upgrade_action()
def _add_services(self):
"""Add services