From: Alfredo Deza Date: Thu, 26 Feb 2015 16:33:47 +0000 (-0500) Subject: add the log object to ceph_manager X-Git-Tag: v10.2.6~165^2^2~538^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f7c1ca4a1e23b03ecf86d5e67d563f95b3a82f99;p=ceph.git add the log object to ceph_manager Signed-off-by: Alfredo Deza --- diff --git a/tasks/ceph_manager.py b/tasks/ceph_manager.py index fc83f84c58d2..9ef69654434f 100644 --- a/tasks/ceph_manager.py +++ b/tasks/ceph_manager.py @@ -9,6 +9,7 @@ import time import gevent import base64 import json +import logging import threading import traceback import os @@ -17,11 +18,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()