Juju Charms Collection
swift-proxy package

Merge lp:~gandelman-a/charms/precise/swift-proxy/lp1202773 into lp:~charmers/charms/precise/swift-proxy/trunk

  1. Precise Pangolin (12.04)
  2. lp1202773
  3. Merge into trunk
Proposed by Adam Gandelman
Status: Merged
Merged at revision: 44
Proposed branch: lp:~gandelman-a/charms/precise/swift-proxy/lp1202773
Merge into: lp:~charmers/charms/precise/swift-proxy/trunk
Diff against target: 20 lines (+3/-2)
2 files modified
hooks/lib/openstack_common.py (+2/-1)
revision (+1/-1)
To merge this branch: bzr merge lp:~gandelman-a/charms/precise/swift-proxy/lp1202773
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+175932@code.launchpad.net
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-05-20 10:42:56 +0000
3+++ hooks/lib/openstack_common.py 2013-07-19 19:42:27 +0000
4@@ -205,7 +205,8 @@
5 error_out(e)
6
7 src = "deb %s %s main" % (CLOUD_ARCHIVE_URL, pocket)
8- _import_key(CLOUD_ARCHIVE_KEY_ID)
9+ cmd = ['apt-get', '-y', 'install', 'ubuntu-cloud-keyring']
10+ subprocess.check_call(cmd)
11
12 with open('/etc/apt/sources.list.d/cloud-archive.list', 'w') as f:
13 f.write(src)
14
15=== modified file 'revision'
16--- revision 2013-05-22 21:42:18 +0000
17+++ revision 2013-07-19 19:42:27 +0000
18@@ -1,1 +1,1 @@
19-132
20+133

Subscribers

People subscribed via source and target branches