Charm Helpers

Merge lp:~james-page/charm-helpers/kilo-enable into lp:charm-helpers

  1. kilo-enable
  2. Merge into devel
Proposed by James Page on 2015-01-08
Status: Merged
Merged at revision: 281
Proposed branch: lp:~james-page/charm-helpers/kilo-enable
Merge into: lp:charm-helpers
Diff against target: 59 lines (+14/-1)
2 files modified
charmhelpers/contrib/openstack/utils.py (+6/-0)
charmhelpers/fetch/__init__.py (+8/-1)
To merge this branch: bzr merge lp:~james-page/charm-helpers/kilo-enable
Reviewer Review Type Date Requested Status
Liam Young 2015-01-08 Approve on 2015-01-12
Review via email: mp+245870@code.launchpad.net

Description of the Change

Add OpenStack Kilo support.

To post a comment you must log in.
lp:~james-page/charm-helpers/kilo-enable updated on 2015-01-08
281. By James Page on 2015-01-08

Add missing bits

282. By James Page on 2015-01-08

REmove double key

Liam Young (gnuoy) wrote :

Approve

review: Approve

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 2014-12-03 16:08:35 +0000
3+++ charmhelpers/contrib/openstack/utils.py 2015-01-08 15:07:24 +0000
4@@ -53,6 +53,7 @@
5 ('saucy', 'havana'),
6 ('trusty', 'icehouse'),
7 ('utopic', 'juno'),
8+ ('vivid', 'kilo'),
9 ])
10
11
12@@ -64,6 +65,7 @@
13 ('2013.2', 'havana'),
14 ('2014.1', 'icehouse'),
15 ('2014.2', 'juno'),
16+ ('2015.1', 'kilo'),
17 ])
18
19 # The ugly duckling
20@@ -84,6 +86,7 @@
21 ('2.0.0', 'juno'),
22 ('2.1.0', 'juno'),
23 ('2.2.0', 'juno'),
24+ ('2.2.1', 'kilo'),
25 ])
26
27 DEFAULT_LOOPBACK_SIZE = '5G'
28@@ -289,6 +292,9 @@
29 'juno': 'trusty-updates/juno',
30 'juno/updates': 'trusty-updates/juno',
31 'juno/proposed': 'trusty-proposed/juno',
32+ 'kilo': 'trusty-updates/kilo',
33+ 'kilo/updates': 'trusty-updates/kilo',
34+ 'kilo/proposed': 'trusty-proposed/kilo',
35 }
36
37 try:
38
39=== modified file 'charmhelpers/fetch/__init__.py'
40--- charmhelpers/fetch/__init__.py 2014-11-25 15:07:02 +0000
41+++ charmhelpers/fetch/__init__.py 2015-01-08 15:07:24 +0000
42@@ -64,9 +64,16 @@
43 'trusty-juno/updates': 'trusty-updates/juno',
44 'trusty-updates/juno': 'trusty-updates/juno',
45 'juno/proposed': 'trusty-proposed/juno',
46- 'juno/proposed': 'trusty-proposed/juno',
47 'trusty-juno/proposed': 'trusty-proposed/juno',
48 'trusty-proposed/juno': 'trusty-proposed/juno',
49+ # Kilo
50+ 'kilo': 'trusty-updates/kilo',
51+ 'trusty-kilo': 'trusty-updates/kilo',
52+ 'trusty-kilo/updates': 'trusty-updates/kilo',
53+ 'trusty-updates/kilo': 'trusty-updates/kilo',
54+ 'kilo/proposed': 'trusty-proposed/kilo',
55+ 'trusty-kilo/proposed': 'trusty-proposed/kilo',
56+ 'trusty-proposed/kilo': 'trusty-proposed/kilo',
57 }
58
59 # The order of this list is very important. Handlers should be listed in from

Subscribers

People subscribed via source and target branches