From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 3 Mar 2016 19:01:46 +0000 (+0000)
Subject: Merge "Add 'conf' param for TextGuruMeditation autorun setup"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1c1309a0d87948b851704fe425ef3ccbbcdde6b0;p=openstack-build%2Fcinder-build.git

Merge "Add 'conf' param for TextGuruMeditation autorun setup"
---

1c1309a0d87948b851704fe425ef3ccbbcdde6b0
diff --cc cinder/cmd/api.py
index 7fe1cb56d,0115b1f4e..80e25eed4
--- a/cinder/cmd/api.py
+++ b/cinder/cmd/api.py
@@@ -48,10 -49,9 +50,10 @@@ def main()
      CONF(sys.argv[1:], project='cinder',
           version=version.version_string())
      logging.setup(CONF, "cinder")
 +    python_logging.captureWarnings(True)
      utils.monkey_patch()
  
-     gmr.TextGuruMeditation.setup_autorun(version)
+     gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
  
      rpc.init(CONF)
      launcher = service.process_launcher()
diff --cc cinder/cmd/backup.py
index 1fb8c1512,1ac0b2b00..19691b551
--- a/cinder/cmd/backup.py
+++ b/cinder/cmd/backup.py
@@@ -46,9 -47,8 +48,9 @@@ def main()
      CONF(sys.argv[1:], project='cinder',
           version=version.version_string())
      logging.setup(CONF, "cinder")
 +    python_logging.captureWarnings(True)
      utils.monkey_patch()
-     gmr.TextGuruMeditation.setup_autorun(version)
+     gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
      server = service.Service.create(binary='cinder-backup')
      service.serve(server)
      service.wait()
diff --cc cinder/cmd/scheduler.py
index 9692fafe9,706330f84..3b3c10332
--- a/cinder/cmd/scheduler.py
+++ b/cinder/cmd/scheduler.py
@@@ -46,9 -47,8 +48,9 @@@ def main()
      CONF(sys.argv[1:], project='cinder',
           version=version.version_string())
      logging.setup(CONF, "cinder")
 +    python_logging.captureWarnings(True)
      utils.monkey_patch()
-     gmr.TextGuruMeditation.setup_autorun(version)
+     gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
      server = service.Service.create(binary='cinder-scheduler')
      service.serve(server)
      service.wait()
diff --cc cinder/cmd/volume.py
index a20344c6d,31013e7d6..580c9265c
--- a/cinder/cmd/volume.py
+++ b/cinder/cmd/volume.py
@@@ -61,9 -62,8 +63,9 @@@ def main()
      CONF(sys.argv[1:], project='cinder',
           version=version.version_string())
      logging.setup(CONF, "cinder")
 +    python_logging.captureWarnings(True)
      utils.monkey_patch()
-     gmr.TextGuruMeditation.setup_autorun(version)
+     gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
      launcher = service.get_launcher()
      LOG = logging.getLogger(__name__)
      service_started = False