diff --git a/templates/ceph.conf b/templates/ceph.conf index 20fd07e..b90e3b4 100644 --- a/templates/ceph.conf +++ b/templates/ceph.conf @@ -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 }} diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 65da3ab..2b6e3df 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -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',