Merge lp:~1chb1n/charm-helpers/lp1679444 into lp:charm-helpers

[Ryan Beisner]

Improve clarity when unit series mismatches UCA config value re: bug 1679444

Unmerged revisions

732. By Ryan Beisner on 2017-04-04

Improve clarity when unit series mismatches UCA config value

=== modified file 'charmhelpers/contrib/openstack/utils.py'
--- charmhelpers/contrib/openstack/utils.py	2017-03-24 16:50:31 +0000
+++ charmhelpers/contrib/openstack/utils.py	2017-04-04 03:34:28 +0000
@@ -287,7 +287,15 @@
 
     if src.startswith('cloud:'):
         ca_rel = src.split(':')[1]
-        ca_rel = ca_rel.split('%s-' % ubuntu_rel)[1].split('/')[0]
+        if ubuntu_rel in ca_rel and '/' in ca_rel:
+            ca_rel = ca_rel.split('%s-' % ubuntu_rel)[1].split('/')[0]
+        else:
+            # Improve clarity when unit series mismatches UCA config value
+            # https://bugs.launchpad.net/bugs/1679444
+            msg = ('Invalid Cloud Archive release value ({}) for '
+                   'Ubuntu release ({})'.format(ca_rel, ubuntu_rel))
+            juju_log(msg, level=ERROR)
+            raise Exception(msg)
         return ca_rel
 
     # Best guess match based on deb string provided