Update Amulet defs, series metadata and c-h sync

- Sync charm helpers if applicable.

- Fix test executable hashbags for virtualenv prep.

- Add Yakkety-Newton Amulet test definitions.

- Prep Xenial-Ocata Amulet test definitions (not yet enabled).

- Prep Zesty-Ocata Amulet test definitions (not yet enabled).

- Remove Precise charm series metadata if present.

- Remove Precise Amulet test definitions if present.

Change-Id: I9952f9df9be1ffd4cdbeaac7e66be587a6dc557c
This commit is contained in:
Ryan Beisner 2016-11-23 12:45:49 -06:00 committed by David Ames
parent 91d8d10382
commit 5f45cd1520
4 changed files with 37 additions and 6 deletions

View File

@ -333,12 +333,22 @@ class AodhBasicDeployment(OpenStackAmuletDeployment):
# Services which are expected to restart upon config change,
# and corresponding config files affected by the change
conf_file = '/etc/aodh/aodh.conf'
services = {
'aodh-api': conf_file,
'aodh-evaluator': conf_file,
'aodh-notifier': conf_file,
'aodh-listener': conf_file,
}
if self._get_openstack_release() >= self.xenial_newton:
services = {
('/usr/bin/python /usr/bin/aodh-api --port 8032 -- '
'--config-file=/etc/aodh/aodh.conf '
'--log-file=/var/log/aodh/aodh-api.log'): conf_file,
'aodh-evaluator - AlarmEvaluationService(0)': conf_file,
'aodh-notifier - AlarmNotifierService(0)': conf_file,
'aodh-listener - EventAlarmEvaluationService(0)': conf_file,
}
else:
services = {
'aodh-api': conf_file,
'aodh-evaluator': conf_file,
'aodh-notifier': conf_file,
'aodh-listener': conf_file,
}
# Make config change, check for service restarts
u.log.debug('Making config change on {}...'.format(juju_service))

View File

@ -0,0 +1,11 @@
#!/usr/bin/env python
"""Amulet tests on a basic aodh deployment on xenial-ocata."""
from basic_deployment import AodhBasicDeployment
if __name__ == '__main__':
deployment = AodhBasicDeployment(series='xenial',
openstack='cloud:xenial-ocata',
source='cloud:xenial-updates/ocata')
deployment.run_tests()

0
src/tests/gate-basic-yakkety-newton Normal file → Executable file
View File

View File

@ -0,0 +1,10 @@
#!/usr/bin/env python
"""Amulet tests on a basic aodh deployment on zesty-ocata."""
from basic_deployment import AodhBasicDeployment
if __name__ == '__main__':
deployment = AodhBasicDeployment(series='zesty')
deployment.run_tests()