Merge lp:~james-page/charm-helpers/icehouse into lp:charm-helpers

[James Page]

Add support for icehouse

=== modified file 'charmhelpers/contrib/openstack/utils.py'
--- charmhelpers/contrib/openstack/utils.py	2013-10-28 11:23:15 +0000
+++ charmhelpers/contrib/openstack/utils.py	2013-12-03 21:35:55 +0000
@@ -41,6 +41,7 @@
     ('quantal', 'folsom'),
     ('raring', 'grizzly'),
     ('saucy', 'havana'),
+    ('trusty', 'icehouse')
 ])
 
 
@@ -260,6 +261,9 @@
             'havana': 'precise-updates/havana',
             'havana/updates': 'precise-updates/havana',
             'havana/proposed': 'precise-proposed/havana',
+            'icehouse': 'precise-updates/icehouse',
+            'icehouse/updates': 'precise-updates/icehouse',
+            'icehouse/proposed': 'precise-proposed/icehouse',
         }
 
         try:
 
=== modified file 'charmhelpers/fetch/__init__.py'
--- charmhelpers/fetch/__init__.py	2013-11-12 09:38:26 +0000
+++ charmhelpers/fetch/__init__.py	2013-12-03 21:35:55 +0000
@@ -44,8 +44,16 @@
     'precise-havana/updates': 'precise-updates/havana',
     'precise-updates/havana': 'precise-updates/havana',
     'havana/proposed': 'precise-proposed/havana',
-    'precies-havana/proposed': 'precise-proposed/havana',
+    'precise-havana/proposed': 'precise-proposed/havana',
     'precise-proposed/havana': 'precise-proposed/havana',
+    # Icehouse
+    'icehouse': 'precise-updates/icehouse',
+    'precise-icehouse': 'precise-updates/icehouse',
+    'precise-icehouse/updates': 'precise-updates/icehouse',
+    'precise-updates/icehouse': 'precise-updates/icehouse',
+    'icehouse/proposed': 'precise-proposed/icehouse',
+    'precise-icehouse/proposed': 'precise-proposed/icehouse',
+    'precise-proposed/icehouse': 'precise-proposed/icehouse',
 }
 
 
 
=== modified file 'tests/contrib/openstack/test_openstack_utils.py'
--- tests/contrib/openstack/test_openstack_utils.py	2013-10-28 11:23:15 +0000
+++ tests/contrib/openstack/test_openstack_utils.py	2013-12-03 21:35:55 +0000
@@ -76,6 +76,10 @@
     ('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'),
+    ('cloud:precise-icehouse/proposed',
+     url + ' precise-proposed/icehouse main'),
+    ('cloud:precise-icehouse', url + ' precise-updates/icehouse main'),
+    ('cloud:precise-icehouse/updates', url + ' precise-updates/icehouse main'),
 ]