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: Ib4afd01fbcc4478ce90de5bd464b7829ecc5da7e Closes-Bug: 1681750
This commit is contained in:
parent
b9cbfeb906
commit
14f5033815
|
@ -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 }}
|
||||
|
||||
|
|
|
@ -327,7 +327,6 @@ class CephOsdBasicDeployment(OpenStackAmuletDeployment):
|
|||
'auth cluster required': 'none',
|
||||
'auth service required': 'none',
|
||||
'auth client required': 'none',
|
||||
'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