From: Alfredo Deza Date: Thu, 26 Feb 2015 16:33:47 +0000 (-0500) Subject: add the log object to ceph_manager X-Git-Tag: v0.94.10~27^2^2~154 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=33f79824800a17265d672fdeba641b0b1fb32261;p=ceph.git add the log object to ceph_manager Signed-off-by: Alfredo Deza (cherry picked from commit f7c1ca4a1e23b03ecf86d5e67d563f95b3a82f99) --- diff --git a/tasks/ceph_manager.py b/tasks/ceph_manager.py index 680e7b114c14..f453965fe881 100644 --- a/tasks/ceph_manager.py +++ b/tasks/ceph_manager.py @@ -8,6 +8,7 @@ import time import gevent import base64 import json +import logging import threading import os from teuthology import misc as teuthology @@ -15,11 +16,12 @@ from tasks.scrub import Scrubber from util.rados import cmd_erasure_code_profile from teuthology.orchestra.remote import Remote from teuthology.orchestra import run -import subprocess DEFAULT_CONF_PATH = '/etc/ceph/ceph.conf' +log = logging.getLogger(__name__) + def write_conf(ctx, conf_path=DEFAULT_CONF_PATH): conf_fp = StringIO()