diff --git a/templates/ceph.conf b/templates/ceph.conf
index fb45e36a..1da9f5da 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 8a90cf18..43c46ef4 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -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',