From a74b1ca3e85f6ec05f8241a8ef3d34a882926eac Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 4 Oct 2019 14:24:26 -0500 Subject: [PATCH] ceph-daemon: all imports to top Signed-off-by: Sage Weil --- src/ceph-daemon | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ceph-daemon b/src/ceph-daemon index b9b3504e2a5..f047d42f18a 100755 --- a/src/ceph-daemon +++ b/src/ceph-daemon @@ -34,10 +34,12 @@ import configparser import json import logging import os +import socket import subprocess import sys import tempfile import time +import uuid from distutils.spawn import find_executable try: @@ -61,15 +63,12 @@ def pathify(p): return p def get_hostname(): - import socket return socket.gethostname() def make_fsid(): - import uuid return str(uuid.uuid1()) def is_fsid(s): - import uuid try: uuid.UUID(s) except: @@ -167,7 +166,6 @@ def create_daemon_dirs(fsid, daemon_type, daemon_id, uid, gid, def get_config_and_keyring(): if args.config_and_keyring: - import json if args.config_and_keyring == '-': try: j = injected_stdin -- 2.39.5