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

Proposed by Adam Gandelman on 2013-10-15
Status: Merged
Merged at revision: 47
Proposed branch: lp:~openstack-charmers/charms/precise/keystone/havana
Merge into: lp:~charmers/charms/precise/keystone/trunk
Diff against target: 34 lines (+6/-2)
2 files modified
hooks/lib/openstack_common.py (+2/-1)
hooks/lib/utils.py (+4/-1)
To merge this branch: bzr merge lp:~openstack-charmers/charms/precise/keystone/havana
Reviewer Review Type Date Requested Status
charmers 2013-10-15 Pending
Review via email: mp+191089@code.launchpad.net

Description of the change

Adds havana support

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 'hooks/lib/openstack_common.py'
2--- hooks/lib/openstack_common.py 2013-04-25 16:57:49 +0000
3+++ hooks/lib/openstack_common.py 2013-10-15 01:38:46 +0000
4@@ -14,6 +14,7 @@
5 'precise': 'essex',
6 'quantal': 'folsom',
7 'raring': 'grizzly',
8+ 'saucy': 'havana',
9 }
10
11
12@@ -110,7 +111,7 @@
13 e = 'Could not determine version of installed package: %s' % pkg
14 error_out(e)
15
16- vers = apt.UpstreamVersion(pkg.current_ver.ver_str)
17+ vers = apt.upstream_version(pkg.current_ver.ver_str)
18
19 try:
20 if 'swift' in pkg.name:
21
22=== modified file 'hooks/lib/utils.py'
23--- hooks/lib/utils.py 2013-08-13 12:55:50 +0000
24+++ hooks/lib/utils.py 2013-10-15 01:38:46 +0000
25@@ -71,7 +71,10 @@
26 'folsom/proposed': 'precise-proposed/folsom',
27 'grizzly': 'precise-updates/grizzly',
28 'grizzly/updates': 'precise-updates/grizzly',
29- 'grizzly/proposed': 'precise-proposed/grizzly'
30+ 'grizzly/proposed': 'precise-proposed/grizzly',
31+ 'havana': 'precise-updates/havana',
32+ 'havana/updates': 'precise-updates/havana',
33+ 'havana/proposed': 'precise-proposed/havana',
34 }
35
36

Subscribers

People subscribed via source and target branches