Merge lp:~james-page/charm-helpers/openstack-havana-plus into lp:charm-helpers

[James Page]

Add versions for swift/havana.

Add pockets for Havana cloud archive.

Use package to import cloud-archive key.

=== modified file 'charmhelpers/contrib/openstack/utils.py'
--- charmhelpers/contrib/openstack/utils.py	2013-07-12 08:18:11 +0000
+++ charmhelpers/contrib/openstack/utils.py	2013-07-12 08:54:32 +0000
@@ -16,6 +16,7 @@
 
 from charmhelpers.core.host import (
     lsb_release,
+    apt_install
 )
 
 CLOUD_ARCHIVE_URL = "http://ubuntu-cloud.archive.canonical.com/ubuntu"
@@ -47,6 +48,8 @@
     '1.7.6': 'grizzly',
     '1.7.7': 'grizzly',
     '1.8.0': 'grizzly',
+    '1.9.0': 'havana',
+    '1.9.1': 'havana',
 }
 
 
@@ -211,7 +214,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',
         }
 
         try:
@@ -221,8 +227,7 @@
             error_out(e)
 
         src = "deb %s %s main" % (CLOUD_ARCHIVE_URL, pocket)
-        # TODO: Replace key import with cloud archive keyring pkg.
-        import_key(CLOUD_ARCHIVE_KEY_ID)
+        apt_install('ubuntu-cloud-keyring', fatal=True)
 
         with open('/etc/apt/sources.list.d/cloud-archive.list', 'w') as f:
             f.write(src)
 
=== modified file 'tests/contrib/openstack/test_openstack_utils.py'
--- tests/contrib/openstack/test_openstack_utils.py	2013-07-12 08:18:11 +0000
+++ tests/contrib/openstack/test_openstack_utils.py	2013-07-12 08:54:32 +0000
@@ -38,6 +38,11 @@
         'os_release': 'grizzly',
         'os_version': '1.7.7'
     },
+    'swift-proxy': {
+        'pkg_vers': '1.9.0-0ubuntu1',
+        'os_release': 'havana',
+        'os_version': '1.9.0'
+    },
     # a package thats available in the cache but is not installed
     'cinder-common': {
         'os_release': 'havana',
@@ -60,6 +65,9 @@
     ('cloud:precise-grizzly/proposed', url + ' precise-proposed/grizzly main'),
     ('cloud:precise-grizzly', url + ' precise-updates/grizzly main'),
     ('cloud:precise-grizzly/updates', url + ' precise-updates/grizzly main'),
+    ('cloud:precise-havana/proposed', url + ' precise-proposed/havana main'),
+    ('cloud:precise-havana', url + ' precise-updates/havana main'),
+    ('cloud:precise-havana/updates', url + ' precise-updates/havana main'),
 ]
 
 
@@ -314,16 +322,17 @@
             _subp.assert_called_with(cmd)
 
     @patch('__builtin__.open')
-    @patch('charmhelpers.contrib.openstack.utils.import_key')
+    @patch('charmhelpers.contrib.openstack.utils.apt_install')
     @patch('charmhelpers.contrib.openstack.utils.lsb_release')
-    def test_configure_install_source_uca_repos(self, _lsb, _import, _open):
+    def test_configure_install_source_uca_repos(self, _lsb, _install, _open):
         '''Test configuring installation source from UCA sources'''
         _lsb.return_value = FAKE_RELEASE
         _file = MagicMock(spec=file)
         _open.return_value = _file
         for src, url in UCA_SOURCES:
             openstack.configure_installation_source(src)
-            _import.assert_called_with(openstack.CLOUD_ARCHIVE_KEY_ID)
+            _install.assert_called_with('ubuntu-cloud-keyring',
+                                        fatal=True)
             _open.assert_called_with(
                 '/etc/apt/sources.list.d/cloud-archive.list',
                 'w'