openstack
/
charm-ceph-osd
Code Issues Proposed changes

Correct osd bootstrap key name

This commit is contained in:
James Page 2013-08-27 14:57:22 +01:00
parent e88bd03583
commit a222c112cb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/ceph.py
View File

@ -199,11 +199,11 @@ def parse_key(raw_key):
def get_osd_bootstrap_key():
try:
# Attempt to get/create a key using the OSD bootstrap profile first
key = get_named_key('client.bootstrap-osd',
key = get_named_key('bootstrap-osd',
_osd_bootstrap_caps_profile)
except:
# If that fails try with the older style permissions
key = get_named_key('client.bootstrap-osd',
key = get_named_key('bootstrap-osd',
_osd_bootstrap_caps)
return key

2
revision
View File

@ -1 +1 @@
10
11