ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use shortname in keyring path 

socket.gethostname may return a FQDN. Problem found in Linode.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 8cd0308f5f)
pull/3667/head
Patrick Donnelly 2019-01-25 18:48:28 -08:00 committed by Guillaume Abrioux
parent b39345751f
commit cb92299756
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/ceph_key.py
View File

@ -612,7 +612,7 @@ def run_module():
module, list_keys(cluster, user, user_key, containerized)) module, list_keys(cluster, user, user_key, containerized))
elif state == "fetch_initial_keys": elif state == "fetch_initial_keys":
hostname = socket.gethostname() hostname = socket.gethostname().split('.', 1)[0]
user = "mon." user = "mon."
user_key = os.path.join( user_key = os.path.join(
"/var/lib/ceph/mon/" + cluster + "-" + hostname + "/keyring") "/var/lib/ceph/mon/" + cluster + "-" + hostname + "/keyring")