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

diff --cc cinder/cmd/api.py
index 7fe1cb56d5a5d1d8412b6f143a040b45af4cc05b,0115b1f4ea91b4e850299f9bf99a005593628feb..80e25eed496d9baccc85dad0b93ac930ca6ca598
--- 1/cinder/cmd/api.py
--- 2/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 1fb8c1512a0cccbd537345a15e820644b28c61d9,1ac0b2b0049d527bdd08d309eda35173ec8de843..19691b551c03efd5e2bf00a1bc8c289891a6744c
--- 1/cinder/cmd/backup.py
--- 2/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 9692fafe9f5e7002b5f8c2d91c2b02861b829f1a,706330f849ea0c0f5691846751f520855c2b0c3d..3b3c1033268c7d6dc7e558a631c5ac559d24b777
--- 1/cinder/cmd/scheduler.py
--- 2/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 a20344c6de3e7a545bfd8be7899c519f8665440d,31013e7d68e6d6451ba7bfce53d7ca65178cbdd9..580c9265cd22ed96a68e04caeebe25e579baac81
--- 1/cinder/cmd/volume.py
--- 2/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