openstack/charm-neutron-gateway
Code Issues Proposed changes

[niedbalski] Force use of http for key imports

Browse Source
This commit is contained in:
James Page 2014-05-02 10:48:12 +01:00
commit 0fc8a2a313
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -12,3 +12,7 @@ test:
sync: sync:
@charm-helper-sync -c charm-helpers-sync.yaml @charm-helper-sync -c charm-helpers-sync.yaml
publish:
bzr push lp:charms/quantum-gateway
bzr push lp:charms/trusty/quantum-gateway

2
hooks/charmhelpers/fetch/__init__.py
View File

@ -184,7 +184,7 @@ def add_source(source, key=None):
apt.write(PROPOSED_POCKET.format(release)) apt.write(PROPOSED_POCKET.format(release))
if key: if key:
subprocess.check_call(['apt-key', 'adv', '--keyserver', subprocess.check_call(['apt-key', 'adv', '--keyserver',
'keyserver.ubuntu.com', '--recv', 'hkp://keyserver.ubuntu.com:80', '--recv',
key]) key])