openstack
/
charm-ceph-osd
Code Issues Proposed changes

Update charmhelpers alongside other ceph charms, add publish target to makefile

This commit is contained in:
James Page 2014-05-02 10:53:33 +01:00
parent d4339cf9dd
commit e76a80181f
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

@ -6,3 +6,7 @@ lint:
sync:
@charm-helper-sync -c charm-helpers-sync.yaml
publish:
bzr push lp:charms/ceph-osd
bzr push lp:charms/trusty/ceph-osd

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

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