Charm Helpers

Merge lp:~ivoks/charm-helpers/keys-port-80 into lp:charm-helpers

  1. keys-port-80
  2. Merge into devel
Proposed by Ante Karamatić
Status: Merged
Merged at revision: 106
Proposed branch: lp:~ivoks/charm-helpers/keys-port-80
Merge into: lp:charm-helpers
Diff against target: 38 lines (+4/-4)
2 files modified
charmhelpers/contrib/openstack/utils.py (+1/-1)
tests/contrib/openstack/test_openstack_utils.py (+3/-3)
To merge this branch: bzr merge lp:~ivoks/charm-helpers/keys-port-80
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+197712@code.launchpad.net

Description of the change

In closed environments, accessing keyserver.ubuntu.com on port 11371 is not allowed. By moving traffic to port 80, we shrink requirements for successful charm deployment. This is almost a critical feature in enterprise environments.

To post a comment you must log in.
Revision history for this message
James Page (james-page) :
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 2013-11-29 17:36:24 +0000
3+++ charmhelpers/contrib/openstack/utils.py 2013-12-04 13:30:04 +0000
4@@ -202,7 +202,7 @@
5
6
7 def import_key(keyid):
8- cmd = "apt-key adv --keyserver keyserver.ubuntu.com " \
9+ cmd = "apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 " \
10 "--recv-keys %s" % keyid
11 try:
12 subprocess.check_call(cmd.split(' '))
13
14=== modified file 'tests/contrib/openstack/test_openstack_utils.py'
15--- tests/contrib/openstack/test_openstack_utils.py 2013-11-29 17:36:24 +0000
16+++ tests/contrib/openstack/test_openstack_utils.py 2013-12-04 13:30:04 +0000
17@@ -425,7 +425,7 @@
18 '''Ensure shell out apt-key during key import'''
19 with patch('subprocess.check_call') as _subp:
20 openstack.import_key('foo')
21- cmd = ['apt-key', 'adv', '--keyserver', 'keyserver.ubuntu.com',
22+ cmd = ['apt-key', 'adv', '--keyserver', 'hkp://keyserver.ubuntu.com:80',
23 '--recv-keys', 'foo']
24 _subp.assert_called_with(cmd)
25
26@@ -433,11 +433,11 @@
27 def test_import_bad_apt_key(self, mocked_error):
28 '''Ensure error when importing apt key fails'''
29 with patch('subprocess.check_call') as _subp:
30- cmd = ['apt-key', 'adv', '--keyserver', 'keyserver.ubuntu.com',
31+ cmd = ['apt-key', 'adv', '--keyserver', 'hkp://keyserver.ubuntu.com:80',
32 '--recv-keys', 'foo']
33 _subp.side_effect = subprocess.CalledProcessError(1, cmd, '')
34 openstack.import_key('foo')
35- cmd = ['apt-key', 'adv', '--keyserver', 'keyserver.ubuntu.com',
36+ cmd = ['apt-key', 'adv', '--keyserver', 'hkp://keyserver.ubuntu.com:80',
37 '--recv-keys', 'foo']
38 mocked_error.assert_called_with('Error importing repo key foo')
39

Subscribers

People subscribed via source and target branches