Merge lp:~openstack-charmers/charms/precise/keystone/havana into lp:~charmers/charms/precise/keystone/trunk

[Adam Gandelman]

Adds havana support

=== modified file 'hooks/lib/openstack_common.py'
--- hooks/lib/openstack_common.py	2013-04-25 16:57:49 +0000
+++ hooks/lib/openstack_common.py	2013-10-15 01:38:46 +0000
@@ -14,6 +14,7 @@
     'precise': 'essex',
     'quantal': 'folsom',
     'raring': 'grizzly',
+    'saucy': 'havana',
 }
 
 
@@ -110,7 +111,7 @@
         e = 'Could not determine version of installed package: %s' % pkg
         error_out(e)
 
-    vers = apt.UpstreamVersion(pkg.current_ver.ver_str)
+    vers = apt.upstream_version(pkg.current_ver.ver_str)
 
     try:
         if 'swift' in pkg.name:

=== modified file 'hooks/lib/utils.py'
--- hooks/lib/utils.py	2013-08-13 12:55:50 +0000
+++ hooks/lib/utils.py	2013-10-15 01:38:46 +0000
@@ -71,7 +71,10 @@
     'folsom/proposed': 'precise-proposed/folsom',
     'grizzly': 'precise-updates/grizzly',
     'grizzly/updates': 'precise-updates/grizzly',
-    'grizzly/proposed': 'precise-proposed/grizzly'
+    'grizzly/proposed': 'precise-proposed/grizzly',
+    'havana': 'precise-updates/havana',
+    'havana/updates': 'precise-updates/havana',
+    'havana/proposed': 'precise-proposed/havana',
     }