Charm Helpers

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

  1. icehouse
  2. Merge into devel
Proposed by James Page
Status: Merged
Approved by: Adam Gandelman
Approved revision: 105
Merged at revision: 105
Proposed branch: lp:~james-page/charm-helpers/icehouse
Merge into: lp:charm-helpers
Diff against target: 56 lines (+17/-1)
3 files modified
charmhelpers/contrib/openstack/utils.py (+4/-0)
charmhelpers/fetch/__init__.py (+9/-1)
tests/contrib/openstack/test_openstack_utils.py (+4/-0)
To merge this branch: bzr merge lp:~james-page/charm-helpers/icehouse
Reviewer Review Type Date Requested Status
Charm Helper Maintainers Pending
Review via email: mp+197609@code.launchpad.net

Description of the change

Add support for icehouse

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/openstack/utils.py'
2--- charmhelpers/contrib/openstack/utils.py 2013-10-28 11:23:15 +0000
3+++ charmhelpers/contrib/openstack/utils.py 2013-12-03 21:35:55 +0000
4@@ -41,6 +41,7 @@
5 ('quantal', 'folsom'),
6 ('raring', 'grizzly'),
7 ('saucy', 'havana'),
8+ ('trusty', 'icehouse')
9 ])
10
11
12@@ -260,6 +261,9 @@
13 'havana': 'precise-updates/havana',
14 'havana/updates': 'precise-updates/havana',
15 'havana/proposed': 'precise-proposed/havana',
16+ 'icehouse': 'precise-updates/icehouse',
17+ 'icehouse/updates': 'precise-updates/icehouse',
18+ 'icehouse/proposed': 'precise-proposed/icehouse',
19 }
20
21 try:
22
23=== modified file 'charmhelpers/fetch/__init__.py'
24--- charmhelpers/fetch/__init__.py 2013-11-12 09:38:26 +0000
25+++ charmhelpers/fetch/__init__.py 2013-12-03 21:35:55 +0000
26@@ -44,8 +44,16 @@
27 'precise-havana/updates': 'precise-updates/havana',
28 'precise-updates/havana': 'precise-updates/havana',
29 'havana/proposed': 'precise-proposed/havana',
30- 'precies-havana/proposed': 'precise-proposed/havana',
31+ 'precise-havana/proposed': 'precise-proposed/havana',
32 'precise-proposed/havana': 'precise-proposed/havana',
33+ # Icehouse
34+ 'icehouse': 'precise-updates/icehouse',
35+ 'precise-icehouse': 'precise-updates/icehouse',
36+ 'precise-icehouse/updates': 'precise-updates/icehouse',
37+ 'precise-updates/icehouse': 'precise-updates/icehouse',
38+ 'icehouse/proposed': 'precise-proposed/icehouse',
39+ 'precise-icehouse/proposed': 'precise-proposed/icehouse',
40+ 'precise-proposed/icehouse': 'precise-proposed/icehouse',
41 }
42
43
44
45=== modified file 'tests/contrib/openstack/test_openstack_utils.py'
46--- tests/contrib/openstack/test_openstack_utils.py 2013-10-28 11:23:15 +0000
47+++ tests/contrib/openstack/test_openstack_utils.py 2013-12-03 21:35:55 +0000
48@@ -76,6 +76,10 @@
49 ('cloud:precise-havana/proposed', url + ' precise-proposed/havana main'),
50 ('cloud:precise-havana', url + ' precise-updates/havana main'),
51 ('cloud:precise-havana/updates', url + ' precise-updates/havana main'),
52+ ('cloud:precise-icehouse/proposed',
53+ url + ' precise-proposed/icehouse main'),
54+ ('cloud:precise-icehouse', url + ' precise-updates/icehouse main'),
55+ ('cloud:precise-icehouse/updates', url + ' precise-updates/icehouse main'),
56 ]
57
58

Subscribers

People subscribed via source and target branches