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: I87ae9d5863f8e9489a4ebf8ceee9412c2ba68657 Closes-Bug: 1681750
This commit is contained in:
parent
6f4ee8e610
commit
5fe6134ded
|
@ -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 }}
|
||||
|
||||
|
|
|
@ -349,7 +349,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',
|
||||
|
|
Loading…
Reference in New Issue