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

@@ -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):

src/metadata.yaml

@@ -12,6 +12,7 @@ description: |
 series:
   - xenial
   - trusty
+  - yakkety
 requires:
   mongodb:
     interface: mongodb

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