From 14f50338158388d64df13c0400b60ce89092e0e9 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Thu, 14 Sep 2017 10:39:52 -0600
Subject: [PATCH] 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
---
templates/ceph.conf | 2 +-
tests/basic_deployment.py | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/templates/ceph.conf b/templates/ceph.conf
index fb45e36..1da9f5d 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 8a90cf1..43c46ef 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',
--
GitLab