openstack
/
charm-ceph
Code Issues Proposed changes

Drop configuration for global keyring 

Drop explicit global configuration of keyring, supporting
installation of the ceph/ceph-mon/ceph-osd charms in the
same machine.

Change-Id: I7e537e7b1c19f2cf675262bf3315868ddc634005
Closes-Bug: 1681750
This commit is contained in:
James Page 2017-09-14 10:36:13 -06:00
parent 44c063580d
commit f936367cac
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/ceph.conf
View File

@ -6,7 +6,7 @@ auth cluster required = {{ auth_supported }}
auth service required = {{ auth_supported }}
auth client required = {{ auth_supported }}
{%- endif %}
keyring = /etc/ceph/$cluster.$name.keyring
mon host = {{ mon_hosts }}
fsid = {{ fsid }}

1
tests/basic_deployment.py
View File

@ -348,7 +348,6 @@ class CephBasicDeployment(OpenStackAmuletDeployment):
conf = '/etc/ceph/ceph.conf'
expected = {
'global': {
'keyring': '/etc/ceph/$cluster.$name.keyring',
'fsid': '6547bd3e-1397-11e2-82e5-53567c8d32dc',
'log to syslog': 'false',
'err to syslog': 'false',