From eab384a251e9b33fdd64aba2449087eafc786fb6 Mon Sep 17 00:00:00 2001 From: James Page Date: Wed, 14 Sep 2016 09:10:09 +0100 Subject: [PATCH] Add yakkety to supported series Also add some misc fixes for unit test failures due to changes in charms.openstack. Change-Id: I1625f7237fd7fc2b98534ea1e0677ca629335ba4 --- src/lib/charm/openstack/aodh.py | 5 +++-- src/metadata.yaml | 1 + unit_tests/__init__.py | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lib/charm/openstack/aodh.py b/src/lib/charm/openstack/aodh.py index b2015d4..24782a2 100644 --- a/src/lib/charm/openstack/aodh.py +++ b/src/lib/charm/openstack/aodh.py @@ -28,12 +28,13 @@ class AodhAdapters(charms_openstack.adapters.OpenStackAPIRelationAdapters): """ Adapters class for the Aodh charm. """ - def __init__(self, relations): + def __init__(self, relations, charm_instance=None): super(AodhAdapters, self).__init__( relations, options_instance=charms_openstack.adapters.APIConfigurationAdapter( service_name='aodh', - port_map=AodhCharm.api_ports)) + port_map=AodhCharm.api_ports), + charm_instance=charm_instance) class AodhCharm(charms_openstack.charm.HAOpenStackCharm): diff --git a/src/metadata.yaml b/src/metadata.yaml index bd65773..ed9f7fa 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -12,6 +12,7 @@ description: | series: - xenial - trusty + - yakkety requires: mongodb: interface: mongodb diff --git a/unit_tests/__init__.py b/unit_tests/__init__.py index 1017763..4f71d66 100644 --- a/unit_tests/__init__.py +++ b/unit_tests/__init__.py @@ -27,6 +27,7 @@ sys.modules['charmhelpers'] = charmhelpers sys.modules['charmhelpers.core'] = charmhelpers.core sys.modules['charmhelpers.core.hookenv'] = charmhelpers.core.hookenv sys.modules['charmhelpers.core.host'] = charmhelpers.core.host +sys.modules['charmhelpers.core.unitdata'] = charmhelpers.core.unitdata sys.modules['charmhelpers.core.templating'] = charmhelpers.core.templating sys.modules['charmhelpers.contrib'] = charmhelpers.contrib sys.modules['charmhelpers.contrib.openstack'] = charmhelpers.contrib.openstack