From: DesmondS Date: Fri, 8 Apr 2016 01:27:24 +0000 (+0800) Subject: [RM-15409] Fix the function name of osd keyring creation X-Git-Tag: v1.5.32~2^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=23ab1673291f0fca38bfd0c23fc842e911eaa635;p=ceph-deploy.git [RM-15409] Fix the function name of osd keyring creation Change the function name of "create_osd" to "create_osd_keyring". This function just do: 1. Check the remote node's osd keyring exist or not 2. If not, it create one. The original name would confused the developers. Signed-off-by: DesmondS --- diff --git a/ceph_deploy/osd.py b/ceph_deploy/osd.py index 131c4fa..91ebff5 100644 --- a/ceph_deploy/osd.py +++ b/ceph_deploy/osd.py @@ -30,7 +30,7 @@ def get_bootstrap_osd_key(cluster): raise RuntimeError('bootstrap-osd keyring not found; run \'gatherkeys\'') -def create_osd(conn, cluster, key): +def create_osd_keyring(conn, cluster, key): """ Run on osd node, writes the bootstrap key if not there yet. """ @@ -307,7 +307,7 @@ def prepare(args, cfg, activate_prepared_disk): args.overwrite_conf ) - create_osd(distro.conn, args.cluster, key) + create_osd_keyring(distro.conn, args.cluster, key) LOG.debug('Preparing host %s disk %s journal %s activate %s', hostname, disk, journal, activate_prepared_disk)