Merge lp:~fnordahl/charm-helpers/fix-occasional-keyerror into lp:charm-helpers

[Frode Nordahl]

[Felipe Reyes (freyes)]

the error message issue was already addressed -> https://github.com/freyes/charm-helpers/commit/1117ba6d00c3ae1d54835f17e42cef106a416f4c

review: Disapprove

Unmerged revisions

700. By Frode Nordahl on 2017-03-01

[fnordahl] Avoid KeyError in the event of incomplete relation

=== modified file 'charmhelpers/contrib/openstack/amulet/utils.py'
--- charmhelpers/contrib/openstack/amulet/utils.py	2017-02-27 22:11:45 +0000
+++ charmhelpers/contrib/openstack/amulet/utils.py	2017-03-01 12:29:04 +0000
@@ -322,6 +322,9 @@
             rel = sentry.relation('identity-service',
                                   relation_name)
             self.log.debug('keystone relation data: {}'.format(rel))
+            if not 'api_version' in rel:
+                raise Exception("no api_version in relation data ('{}')."
+                                "".format(rel))
             if rel['api_version'] != str(api_version):
                 raise Exception("api_version not propagated through relation"
                                 " data yet ('{}' != '{}')."