From: Sage Weil <sage@redhat.com>
Date: Fri, 4 Oct 2019 19:24:26 +0000 (-0500)
Subject: ceph-daemon: all imports to top
X-Git-Tag: v15.1.0~1313^2~9
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a74b1ca3e85f6ec05f8241a8ef3d34a882926eac;p=ceph-ci.git

ceph-daemon: all imports to top

Signed-off-by: Sage Weil <sage@redhat.com>
---

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